Fix compilation against newest ffmpeg, bug #180547, also remove long time deprecated max c++ syntax that has been removed in gcc 4.2

Package-Manager: portage-2.1.2.9

5 files changed, 172 insertions, 14 deletions

diff --git a/media-video/dvbcut/ChangeLog b/media-video/dvbcut/ChangeLog
index b7c52e07cf52..c9205704968f 100644
--- a/media-video/dvbcut/ChangeLog
+++ b/media-video/dvbcut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/dvbcut
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/ChangeLog,v 1.5 2007/04/14 23:18:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/ChangeLog,v 1.6 2007/06/01 18:47:34 aballier Exp $
+
+  01 Jun 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/dvbcut-0.5.4-ffmpeg-compat2.patch, +files/dvbcut-0.5.4-gcc42.patch,
+  dvbcut-0.5.4.ebuild:
+  Fix compilation against newest ffmpeg, bug #180547, also remove long time
+  deprecated max c++ syntax that has been removed in gcc 4.2
 
 *dvbcut-0.5.4 (14 Apr 2007)
 
diff --git a/media-video/dvbcut/Manifest b/media-video/dvbcut/Manifest
index 74320899dd5c..88c3da4e9fda 100644
--- a/media-video/dvbcut/Manifest
+++ b/media-video/dvbcut/Manifest
@@ -13,20 +13,28 @@ AUX dvbcut-0.5.3-sconstruct.patch 1070 RMD160 07b7fd7b0e4c38fd03600eabbeff83465a
 MD5 a64f2250e5179420c54c8fea137c75e4 files/dvbcut-0.5.3-sconstruct.patch 1070
 RMD160 07b7fd7b0e4c38fd03600eabbeff83465afcbe7a files/dvbcut-0.5.3-sconstruct.patch 1070
 SHA256 8626581fa0d461da4616c565b4a773580b091f1c37c6d0921c7819948eb9c3db files/dvbcut-0.5.3-sconstruct.patch 1070
+AUX dvbcut-0.5.4-ffmpeg-compat2.patch 3262 RMD160 8c819ffab5b6a54246915a2eb575efa6674bef24 SHA1 9aa636d911da28d29bcc7024ad9eafba2e7d80c2 SHA256 aec5a2c92fc839e87da35a6875ee273c93d1dd36292be9e2e9f7a5a8782286c1
+MD5 f4e0a2cae5d37c3f1b24881269869153 files/dvbcut-0.5.4-ffmpeg-compat2.patch 3262
+RMD160 8c819ffab5b6a54246915a2eb575efa6674bef24 files/dvbcut-0.5.4-ffmpeg-compat2.patch 3262
+SHA256 aec5a2c92fc839e87da35a6875ee273c93d1dd36292be9e2e9f7a5a8782286c1 files/dvbcut-0.5.4-ffmpeg-compat2.patch 3262
+AUX dvbcut-0.5.4-gcc42.patch 576 RMD160 6e84fa4a525f4bba1f4f8263048b8dd89ddd2294 SHA1 adb11d4d8eb3b48c1c5a437fb70013c6e3b0e104 SHA256 9792d58872aa949233d3b554019cf63ba08c8ee4a2bd03ece55b69392f521a83
+MD5 f56c0d9ca9e2ee1e7ed6c610d1ab2818 files/dvbcut-0.5.4-gcc42.patch 576
+RMD160 6e84fa4a525f4bba1f4f8263048b8dd89ddd2294 files/dvbcut-0.5.4-gcc42.patch 576
+SHA256 9792d58872aa949233d3b554019cf63ba08c8ee4a2bd03ece55b69392f521a83 files/dvbcut-0.5.4-gcc42.patch 576
 DIST dvbcut_0.5.3.tar.bz2 791953 RMD160 8a51c528a2274db44c864b1315b25e7cff7bb12d SHA1 728352121d00b862b2104162385ecd1c5ced69c9 SHA256 6496e5a9fe9a4313a480a3b21f075ea17e07451499d2c8e27559f1c4878b5238
 DIST dvbcut_0.5.4.tar.bz2 795991 RMD160 fc36b9d3abd818495498c1d8181e1250f43e0057 SHA1 2bf174ec05fd92a9ac5878498c91f90bd307a2ca SHA256 db6500fc327585be6ee5a36135c9940828d22bde936daa17b6a5cce852ad9f70
 EBUILD dvbcut-0.5.3-r1.ebuild 1333 RMD160 533169cd23fc24a6f613cff7332eebeed8abafbc SHA1 58c20ce3fc2463ae08a4606f3e9f77944d87e28e SHA256 dba94773f8b15e0cdc21f83d10c6adba940cdb62c054e86eab367935c935981b
 MD5 11333a45afa0bf7dbcc7971ec4bd8837 dvbcut-0.5.3-r1.ebuild 1333
 RMD160 533169cd23fc24a6f613cff7332eebeed8abafbc dvbcut-0.5.3-r1.ebuild 1333
 SHA256 dba94773f8b15e0cdc21f83d10c6adba940cdb62c054e86eab367935c935981b dvbcut-0.5.3-r1.ebuild 1333
-EBUILD dvbcut-0.5.4.ebuild 1249 RMD160 47acd45537a05e00ed49a7ac48e22441fbd1fbcf SHA1 5c0041c5de22b2dbfa846e5e5cfea4099bae56aa SHA256 7319c090b6c4e7fe9e12bc6aacb9af7ff6478bc775117f16799faff88aff7a5c
-MD5 bac2cfee8e61e2abb72ae206223b0314 dvbcut-0.5.4.ebuild 1249
-RMD160 47acd45537a05e00ed49a7ac48e22441fbd1fbcf dvbcut-0.5.4.ebuild 1249
-SHA256 7319c090b6c4e7fe9e12bc6aacb9af7ff6478bc775117f16799faff88aff7a5c dvbcut-0.5.4.ebuild 1249
-MISC ChangeLog 1376 RMD160 128083d0c3075003a99f826c8750c4f7143cf450 SHA1 114ec64fc128a84503197403d822171a50b2a829 SHA256 84545514c83a27691ce94781cc700a38dab84bf24b1acb8d1f2c0cdc5126e181
-MD5 0be1572595761bcac5c0ad0d46e02b0a ChangeLog 1376
-RMD160 128083d0c3075003a99f826c8750c4f7143cf450 ChangeLog 1376
-SHA256 84545514c83a27691ce94781cc700a38dab84bf24b1acb8d1f2c0cdc5126e181 ChangeLog 1376
+EBUILD dvbcut-0.5.4.ebuild 1336 RMD160 35255d1406d61d933c88219917af2a1183a24666 SHA1 a015897802b6b89a31b7c78f0f68d37f1128697a SHA256 6fcb9fe042557d1fe64a0af12a7801b1a7f98ce8c94946bd1706e1c6cfbc114f
+MD5 2ccc87edb8700dbfd8af3575d622560e dvbcut-0.5.4.ebuild 1336
+RMD160 35255d1406d61d933c88219917af2a1183a24666 dvbcut-0.5.4.ebuild 1336
+SHA256 6fcb9fe042557d1fe64a0af12a7801b1a7f98ce8c94946bd1706e1c6cfbc114f dvbcut-0.5.4.ebuild 1336
+MISC ChangeLog 1666 RMD160 d5381544b5a1d03b4bc0b8ad3868e22d20b79297 SHA1 299fcee942e00e3dc90b5347e46ef2d985ebaa19 SHA256 7230406073c3b092d1420efdbe28b9b6067696e3028e4f80ce95b327ce57f9ec
+MD5 f2fa93b68b07a331d1802f537dd8d434 ChangeLog 1666
+RMD160 d5381544b5a1d03b4bc0b8ad3868e22d20b79297 ChangeLog 1666
+SHA256 7230406073c3b092d1420efdbe28b9b6067696e3028e4f80ce95b327ce57f9ec ChangeLog 1666
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -38,9 +46,9 @@ MD5 68a668c208545818355af0e0a827f6f5 files/digest-dvbcut-0.5.4 241
 RMD160 576297ca9a6bb1ee724a29159eb0c79b12c281f2 files/digest-dvbcut-0.5.4 241
 SHA256 d39fe62f6e9623d8a8b8fa2b7560278e0dc9b7aed00d371da6aeb5cd9fdac370 files/digest-dvbcut-0.5.4 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGIWD5vFcC4BYPU0oRAgz1AKCOlqDp8glisuhKiMrmyur2OcyKvwCgphw3
-OmJVxhyc/L5RYjr0UzJ3aco=
-=pIMa
+iD8DBQFGYGnQvFcC4BYPU0oRAnxuAJ97YJsSgDGLYhJAxfXsCSNKAgks/ACgnnTC
+wi9MWsAnTYUj6tTfTv/LnP0=
+=H/d5
 -----END PGP SIGNATURE-----
diff --git a/media-video/dvbcut/dvbcut-0.5.4.ebuild b/media-video/dvbcut/dvbcut-0.5.4.ebuild
index 439c160c4c45..f904534a056a 100644
--- a/media-video/dvbcut/dvbcut-0.5.4.ebuild
+++ b/media-video/dvbcut/dvbcut-0.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/dvbcut-0.5.4.ebuild,v 1.1 2007/04/14 23:18:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/dvbcut-0.5.4.ebuild,v 1.2 2007/06/01 18:47:34 aballier Exp $
 
 inherit qt3 eutils
 
@@ -36,6 +36,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-0.5.3-ffmpeg-compat.patch"
+	epatch "${FILESDIR}/${P}-gcc42.patch"
+	epatch "${FILESDIR}/${P}-ffmpeg-compat2.patch"
 }
 
 src_compile() {
diff --git a/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-compat2.patch b/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-compat2.patch
new file mode 100644
index 000000000000..b58228630965
--- /dev/null
+++ b/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-compat2.patch
@@ -0,0 +1,129 @@
+Index: dvbcut-0.5.4/src/avframe.h
+===================================================================
+--- dvbcut-0.5.4.orig/src/avframe.h
++++ dvbcut-0.5.4/src/avframe.h
+@@ -19,7 +19,9 @@
+ #ifndef _DVBCUT_AVFRAME_H
+ #define _DVBCUT_AVFRAME_H
+ 
++extern "C" {
+ #include <ffmpeg/avcodec.h>
++}
+ 
+ class QImage;
+ 
+Index: dvbcut-0.5.4/src/lavfmuxer.cpp
+===================================================================
+--- dvbcut-0.5.4.orig/src/lavfmuxer.cpp
++++ dvbcut-0.5.4/src/lavfmuxer.cpp
+@@ -16,7 +16,9 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++extern "C" {
+ #include <ffmpeg/avformat.h>
++}
+ #include <string.h>
+ #include <utility>
+ #include <list>
+Index: dvbcut-0.5.4/src/lavfmuxer.h
+===================================================================
+--- dvbcut-0.5.4.orig/src/lavfmuxer.h
++++ dvbcut-0.5.4/src/lavfmuxer.h
+@@ -19,7 +19,9 @@
+ #ifndef _DVBCUT_LAVFMUXER_H
+ #define _DVBCUT_LAVFMUXER_H
+ 
++extern "C" {
+ #include <ffmpeg/avformat.h>
++}
+ #include "mpgfile.h"
+ #include "muxer.h"
+ 
+Index: dvbcut-0.5.4/src/main.cpp
+===================================================================
+--- dvbcut-0.5.4.orig/src/main.cpp
++++ dvbcut-0.5.4/src/main.cpp
+@@ -27,7 +27,9 @@
+ #endif // HAVE_LIB_AO
+ 
+ #include <qapplication.h>
++extern "C" {
+ #include <ffmpeg/avformat.h>
++}
+ #include <qimage.h>
+ #include <qsettings.h>
+ #include "dvbcut.h"
+Index: dvbcut-0.5.4/src/mpgfile.h
+===================================================================
+--- dvbcut-0.5.4.orig/src/mpgfile.h
++++ dvbcut-0.5.4/src/mpgfile.h
+@@ -19,7 +19,10 @@
+ #ifndef _DVBCUT_MPGFILE_H
+ #define _DVBCUT_MPGFILE_H
+ 
++extern "C" {
+ #include <ffmpeg/avcodec.h>
++}
++
+ #include <string>
+ #include <vector>
+ #include <list>
+Index: dvbcut-0.5.4/src/playaudio.cpp
+===================================================================
+--- dvbcut-0.5.4.orig/src/playaudio.cpp
++++ dvbcut-0.5.4/src/playaudio.cpp
+@@ -19,7 +19,10 @@
+ #ifdef HAVE_LIB_AO
+ #include <stdio.h>
+ #include <ao/ao.h>
++extern "C" {
+ #include <ffmpeg/avcodec.h>
++}
++
+ #include "playaudio.h"
+ 
+ #define MIN_BUFFER_SAMPLES (1536*6)
+Index: dvbcut-0.5.4/src/psfile.cpp
+===================================================================
+--- dvbcut-0.5.4.orig/src/psfile.cpp
++++ dvbcut-0.5.4/src/psfile.cpp
+@@ -19,7 +19,10 @@
+ #include "psfile.h"
+ #include "streamhandle.h"
+ #include "stream.h"
++
++extern "C" {
+ #include <ffmpeg/avcodec.h>
++}
+ 
+ psfile::psfile(const std::string &filename, inbuffer &b, int initial_offset)
+     : mpgfile(filename, b, initial_offset)
+Index: dvbcut-0.5.4/src/streamdata.h
+===================================================================
+--- dvbcut-0.5.4.orig/src/streamdata.h
++++ dvbcut-0.5.4/src/streamdata.h
+@@ -21,7 +21,9 @@
+ 
+ #include <string>
+ #include <list>
++extern "C" {
+ #include <ffmpeg/avformat.h>
++}
+ 
+ #include "port.h"
+ #include "tsfile.h"
+Index: dvbcut-0.5.4/src/tsfile.cpp
+===================================================================
+--- dvbcut-0.5.4.orig/src/tsfile.cpp
++++ dvbcut-0.5.4/src/tsfile.cpp
+@@ -22,7 +22,9 @@
+ #include <list>
+ #include <utility>
+ 
++extern "C" {
+ #include <ffmpeg/avcodec.h>
++}
+ 
+ tsfile::tsfile(const std::string &filename, inbuffer &b, int initial_offset)
+     : mpgfile(filename, b, initial_offset)
diff --git a/media-video/dvbcut/files/dvbcut-0.5.4-gcc42.patch b/media-video/dvbcut/files/dvbcut-0.5.4-gcc42.patch
new file mode 100644
index 000000000000..ba61fcdca064
--- /dev/null
+++ b/media-video/dvbcut/files/dvbcut-0.5.4-gcc42.patch
@@ -0,0 +1,13 @@
+Index: dvbcut-0.5.4/src/playaudio.cpp
+===================================================================
+--- dvbcut-0.5.4.orig/src/playaudio.cpp
++++ dvbcut-0.5.4/src/playaudio.cpp
+@@ -38,7 +38,7 @@ void playaudio(const void *data, uint32_
+   const uint8_t *d=(const uint8_t*)data;
+ 
+   while (len>0) {
+-    int16_t samples[MIN_BUFFER_SAMPLES >? avcc->frame_size];
++    int16_t samples[MIN_BUFFER_SAMPLES > avcc->frame_size ? MIN_BUFFER_SAMPLES : avcc->frame_size ];
+     int frame_size;
+ 
+     int bytesDecoded=avcodec_decode_audio(avcc,samples,&frame_size,(uint8_t*)d,len);