Package: performous
Version: 0.6.1-2
Severity: wishlist
Tags: patch

libav 0.7 is currently in Experimental.  It has some API changes that affect
performous.  The attached patch will enable performous to build against libav
0.7.
diff -Nru performous-0.6.1/debian/changelog performous-0.6.1/debian/changelog
--- performous-0.6.1/debian/changelog	2011-06-09 12:17:46.000000000 -0400
+++ performous-0.6.1/debian/changelog	2011-08-08 09:49:35.000000000 -0400
@@ -1,3 +1,10 @@
+performous (0.6.1-3) UNRELEASED; urgency=low
+
+  * Add debian/patches/libav_api_change.patch to support building with libav
+    0.7
+
+ -- Scott Kitterman <sc...@kitterman.com>  Mon, 08 Aug 2011 09:48:50 -0400
+
 performous (0.6.1-2) unstable; urgency=low
 
   * Team upload.
diff -Nru performous-0.6.1/debian/control performous-0.6.1/debian/control
--- performous-0.6.1/debian/control	2011-06-09 11:49:24.000000000 -0400
+++ performous-0.6.1/debian/control	2011-08-08 09:46:46.000000000 -0400
@@ -9,7 +9,7 @@
  libboost-thread-dev (>= 1.36), libboost-serialization-dev (>= 1.36),
  libboost-program-options-dev (>= 1.36), libboost-regex-dev (>= 1.36),
  libboost-filesystem-dev (>= 1.36),
- libavcodec-dev, libavformat-dev, libswscale-dev,
+ libavcodec-dev (>= 0.7), libavformat-dev, libswscale-dev,
  libmagick++-dev, libsamplerate0-dev, libxml++2.6-dev,
  libasound2-dev, libjack-dev, libpulse-dev, portaudio19-dev,
  libgstreamer0.10-dev, libglew1.5-dev
diff -Nru performous-0.6.1/debian/patches/libav_api_change.patch performous-0.6.1/debian/patches/libav_api_change.patch
--- performous-0.6.1/debian/patches/libav_api_change.patch	1969-12-31 19:00:00.000000000 -0500
+++ performous-0.6.1/debian/patches/libav_api_change.patch	2011-08-08 09:47:38.000000000 -0400
@@ -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");
diff -Nru performous-0.6.1/debian/patches/series performous-0.6.1/debian/patches/series
--- performous-0.6.1/debian/patches/series	2011-06-09 11:41:15.000000000 -0400
+++ performous-0.6.1/debian/patches/series	2011-08-08 09:35:48.000000000 -0400
@@ -1,2 +1,3 @@
 desktop.patch
 boost_filesystem_v2.patch
+libav_api_change.patch

Reply via email to