From 9188a0f4992af0698ff6ac67f132091f7512b037 Mon Sep 17 00:00:00 2001 From: fake Date: Wed, 5 Apr 2006 13:16:44 +0000 Subject: [PATCH] fake: mpeg4ip: update to 1.4.1, remove gcc40.patch and fix compile [2006033117010512290] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7474 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/stf/mpeg4ip/gcc40.patch | 134 ------------------------------- package/stf/mpeg4ip/mpeg4ip.conf | 3 + package/stf/mpeg4ip/mpeg4ip.desc | 4 +- 3 files changed, 5 insertions(+), 136 deletions(-) delete mode 100644 package/stf/mpeg4ip/gcc40.patch diff --git a/package/stf/mpeg4ip/gcc40.patch b/package/stf/mpeg4ip/gcc40.patch deleted file mode 100644 index b248b9fd5..000000000 --- a/package/stf/mpeg4ip/gcc40.patch +++ /dev/null @@ -1,134 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/stf/mpeg4ip/gcc40.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/include/bitstrm.hpp src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/bitstrm.hpp ---- mpeg4ip-1.3/common/video/iso-mpeg4/include/bitstrm.hpp 2005-05-04 21:55:58.000000000 +0200 -+++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/bitstrm.hpp 2005-10-22 14:41:16.000000000 +0200 -@@ -46,8 +46,6 @@ - #define _BITSTREAM_HPP_ - #include "inbits.h" - #include --class istream; --class ostream; - - class CIOBitStream - { -diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/include/enhcbufdec.hpp src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/enhcbufdec.hpp ---- mpeg4ip-1.3/common/video/iso-mpeg4/include/enhcbufdec.hpp 2005-05-04 21:55:58.000000000 +0200 -+++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/enhcbufdec.hpp 2005-10-22 14:57:25.000000000 +0200 -@@ -43,6 +43,9 @@ - /****************************************** - *** class CEnhcBufferDecoder *** - ******************************************/ -+class CVideoObjectDecoder; -+class CVideoObjectDecoderTPS; -+ - class CEnhcBufferDecoder : public CEnhcBuffer - { - friend class CVideoObjectDecoder; -diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/include/entropy.hpp src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/entropy.hpp ---- mpeg4ip-1.3/common/video/iso-mpeg4/include/entropy.hpp 2005-05-04 21:55:58.000000000 +0200 -+++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/entropy.hpp 2005-10-22 14:49:30.000000000 +0200 -@@ -39,12 +39,16 @@ - #ifndef __ENTROPY_HPP_ - #define __ENTROPY_HPP_ - -+#include -+#include -+ -+using std::istream; -+using std::ostream; - --class istream; --class ostream; - class CInBitStream; - class COutBitStream; - -+ - typedef struct VlcTableTag { - Int lSymbol; - char *pchBits; -diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/include/huffman.hpp src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/huffman.hpp ---- mpeg4ip-1.3/common/video/iso-mpeg4/include/huffman.hpp 2005-05-04 21:55:58.000000000 +0200 -+++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/huffman.hpp 2005-10-22 14:41:40.000000000 +0200 -@@ -48,8 +48,6 @@ - - #define VM_HOME_DIR "\\vm" - --class istream; --class ostream; - class CInBitStream; - class COutBitStream; - class CEntropyEncoder; -diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/include/sesenc.hpp src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/sesenc.hpp ---- mpeg4ip-1.3/common/video/iso-mpeg4/include/sesenc.hpp 2005-05-04 21:55:58.000000000 +0200 -+++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/sesenc.hpp 2005-10-22 15:00:00.000000000 +0200 -@@ -78,6 +78,7 @@ - class CEntropyEncoder; - class CEntropyEncoderSet; - class CVideoObjectEncoder; -+class CEnhcBufferEncoder; - - typedef struct { - // general info -diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/include/vopsedec.hpp src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/vopsedec.hpp ---- mpeg4ip-1.3/common/video/iso-mpeg4/include/vopsedec.hpp 2005-05-04 21:55:58.000000000 +0200 -+++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/vopsedec.hpp 2005-10-22 14:51:19.000000000 +0200 -@@ -66,7 +66,6 @@ - #define __VOPSEDEC_HPP_ - - class CVideoObject; --class ifstream; - class strstreambuf; - class CInBitStream; - class CEntropyDecoderSet; -diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.am src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.am ---- mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.am 2005-05-04 22:25:06.000000000 +0200 -+++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.am 2005-10-22 14:25:15.000000000 +0200 -@@ -1,5 +1,5 @@ - --AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@ -+AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@ - - INCLUDES = -I../include - -diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.in src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.in ---- mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.in 2005-05-19 00:02:21.000000000 +0200 -+++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.in 2005-10-22 14:25:15.000000000 +0200 -@@ -355,7 +355,7 @@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ --AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@ -+AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@ - INCLUDES = -I../include - lib_LTLIBRARIES = libmpeg4ip_mpeg4_iso.la - mp4vdec_SOURCES = \ -diff -dur mpeg4ip-1.3/lib/SDLAudio/src/audio/SDL_audio.c src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/lib/SDLAudio/src/audio/SDL_audio.c ---- mpeg4ip-1.3/lib/SDLAudio/src/audio/SDL_audio.c 2005-01-13 19:21:29.000000000 +0100 -+++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/lib/SDLAudio/src/audio/SDL_audio.c 2005-10-22 14:17:48.000000000 +0200 -@@ -115,7 +115,7 @@ - #endif - - /* The general mixing thread function */ --static int SDL_RunAudio(void *audiop) -+int SDL_RunAudio(void *audiop) - { - SDL_AudioDevice *audio = (SDL_AudioDevice *)audiop; - Uint8 *stream; diff --git a/package/stf/mpeg4ip/mpeg4ip.conf b/package/stf/mpeg4ip/mpeg4ip.conf index eed2887b8..da71e2377 100644 --- a/package/stf/mpeg4ip/mpeg4ip.conf +++ b/package/stf/mpeg4ip/mpeg4ip.conf @@ -22,3 +22,6 @@ hook_add preconf 3 "./bootstrap" + +var_append confopt " " "--disable-warns-as-err" +var_append CXX_WRAPPER_REMOVE " " "-Werror" diff --git a/package/stf/mpeg4ip/mpeg4ip.desc b/package/stf/mpeg4ip/mpeg4ip.desc index bb29dcb79..0aeb1a005 100644 --- a/package/stf/mpeg4ip/mpeg4ip.desc +++ b/package/stf/mpeg4ip/mpeg4ip.desc @@ -46,7 +46,7 @@ [L] MPL [S] Stable -[V] 1.3 +[V] 1.4.1 [P] X -?---5---9 163.900 -[D] 3818291558 mpeg4ip-1.3.tar.gz http://dl.sourceforge.net/mpeg4ip/ +[D] 698484256 mpeg4ip-1.4.1.tar.gz http://dl.sourceforge.net/mpeg4ip/