r12639 - in packages/trunk/performous/debian: . patches

[Moritz Muehlenhoff]

Author: jmm
Date: 2011-08-24 21:02:43 +0000 (Wed, 24 Aug 2011)
New Revision: 12639

Added:
   packages/trunk/performous/debian/patches/libav_api_change.patch
Modified:
   packages/trunk/performous/debian/changelog
   packages/trunk/performous/debian/control
   packages/trunk/performous/debian/patches/series
Log:
  * Remove deprecated ffmpeg/libav API functions. This prevents a
    FTBFS when libav/0.7 is uploaded to unstable. Patch by Scott
    Kitterman (Closes: #637105)
  * Drop transition package ultrastar-ng now that Squeeze is released


Modified: packages/trunk/performous/debian/changelog
===================================================================
--- packages/trunk/performous/debian/changelog	2011-08-22 21:48:38 UTC (rev 12638)
+++ packages/trunk/performous/debian/changelog	2011-08-24 21:02:43 UTC (rev 12639)
@@ -1,3 +1,13 @@
+performous (0.6.1-3) unstable; urgency=low
+
+  * Team upload.
+  * Remove deprecated ffmpeg/libav API functions. This prevents a
+    FTBFS when libav/0.7 is uploaded to unstable. Patch by Scott
+    Kitterman (Closes: #637105)
+  * Drop transition package ultrastar-ng now that Squeeze is released
+
+ -- Moritz Muehlenhoff <jmm at debian.org>  Wed, 24 Aug 2011 22:33:21 +0200
+
 performous (0.6.1-2) unstable; urgency=low
 
   * Team upload.

Modified: packages/trunk/performous/debian/control
===================================================================
--- packages/trunk/performous/debian/control	2011-08-22 21:48:38 UTC (rev 12638)
+++ packages/trunk/performous/debian/control	2011-08-24 21:02:43 UTC (rev 12639)
@@ -62,14 +62,7 @@
  .
  This package includes the debugging symbols.
 
-Package: ultrastar-ng
-Architecture: all
-Depends: performous, ${misc:Depends}
-Description: karaoke game - transitional package
- A karaoke, band and dancing game where one or more players perform a song
- and the game scores their performances. Supports songs in UltraStar,
- Frets on Fire and StepMania formats. Microphones and instruments from
- SingStar, Guitar Hero and Rock Band as well as some dance pads are
- autodetected.
- .
- This is a transitional package to provide a smooth transition
+
+
+
+

Added: packages/trunk/performous/debian/patches/libav_api_change.patch
===================================================================
--- packages/trunk/performous/debian/patches/libav_api_change.patch	                        (rev 0)
+++ packages/trunk/performous/debian/patches/libav_api_change.patch	2011-08-24 21:02:43 UTC (rev 12639)
@@ -0,0 +1,16 @@
+libav 0.7 API change
+Index: performous-0.6.1/game/ffmpeg.cc
+===================================================================
+--- performous-0.6.1.orig/game/ffmpeg.cc	2011-08-08 09:36:02.596685105 -0400
++++ performous-0.6.1/game/ffmpeg.cc	2011-08-08 09:37:24.380685064 -0400
+@@ -60,8 +60,8 @@
+ 	for (unsigned int i=0; i<pFormatCtx->nb_streams; i++) {
+ 		AVCodecContext* cc = pFormatCtx->streams[i]->codec;
+ 		cc->workaround_bugs = FF_BUG_AUTODETECT;
+-		if (videoStream == -1 && cc->codec_type==CODEC_TYPE_VIDEO) videoStream = i;
+-		if (audioStream == -1 && cc->codec_type==CODEC_TYPE_AUDIO) audioStream = i;
++		if (videoStream == -1 && cc->codec_type==AVMEDIA_TYPE_VIDEO) videoStream = i;
++		if (audioStream == -1 && cc->codec_type==AVMEDIA_TYPE_AUDIO) audioStream = i;
+ 	}
+ 	if (videoStream == -1 && decodeVideo) throw std::runtime_error("No video stream found");
+ 	if (audioStream == -1 && decodeAudio) throw std::runtime_error("No audio stream found");

Modified: packages/trunk/performous/debian/patches/series
===================================================================
--- packages/trunk/performous/debian/patches/series	2011-08-22 21:48:38 UTC (rev 12638)
+++ packages/trunk/performous/debian/patches/series	2011-08-24 21:02:43 UTC (rev 12639)
@@ -1,2 +1,3 @@
 desktop.patch
 boost_filesystem_v2.patch
+libav_api_change.patch