r13879 - packages/trunk/performous/debian/patches

[Miriam Ruiz]

Author: miriam
Date: 2012-11-23 18:16:29 +0000 (Fri, 23 Nov 2012)
New Revision: 13879

Added:
   packages/trunk/performous/debian/patches/jpeg-detection.patch
   packages/trunk/performous/debian/patches/libav0.8.diff
   packages/trunk/performous/debian/patches/libav_api_change.patch
Log:
Finished package



Added: packages/trunk/performous/debian/patches/jpeg-detection.patch
===================================================================
--- packages/trunk/performous/debian/patches/jpeg-detection.patch	                        (rev 0)
+++ packages/trunk/performous/debian/patches/jpeg-detection.patch	2012-11-23 18:16:29 UTC (rev 13879)
@@ -0,0 +1,16 @@
+Description: fix jpeg library detection
+ Check for jpeglib.h which is actually included instead of jconfig.h.
+ The latter is installed in multiarch location.
+Author: Ilya Barygin <randomaction at ubuntu.com>
+
+--- performous-0.6.1.orig/cmake/Modules/FindJpeg.cmake
++++ performous-0.6.1/cmake/Modules/FindJpeg.cmake
+@@ -13,7 +13,7 @@ include(LibFindMacros)
+ libfind_pkg_check_modules(Jpeg_PKGCONF jpeg)
+ 
+ find_path(Jpeg_INCLUDE_DIR
+-  NAMES jconfig.h
++  NAMES jpeglib.h
+   PATHS ${Jpeg_PKGCONF_INCLUDE_DIRS}
+ )
+ 

Added: packages/trunk/performous/debian/patches/libav0.8.diff
===================================================================
--- packages/trunk/performous/debian/patches/libav0.8.diff	                        (rev 0)
+++ packages/trunk/performous/debian/patches/libav0.8.diff	2012-11-23 18:16:29 UTC (rev 13879)
@@ -0,0 +1,18 @@
+Subject: Add missing include
+From: Ansgar Burchardt <ansgar at debian.org>
+Date: Sun, 15 Jan 2012 22:42:32 +0100
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/654221
+
+Index: performous-0.7.0/game/ffmpeg.cc
+===================================================================
+--- performous-0.7.0.orig/game/ffmpeg.cc	2012-11-12 23:14:08.000000000 +0100
++++ performous-0.7.0/game/ffmpeg.cc	2012-11-21 00:00:16.000000000 +0100
+@@ -8,6 +8,7 @@
+ 
+ extern "C" {
+ #include AVCODEC_INCLUDE
++#include <libavutil/mathematics.h>
+ #include AVFORMAT_INCLUDE
+ #include SWSCALE_INCLUDE
+ }

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	2012-11-23 18:16:29 UTC (rev 13879)
@@ -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");