packages: mpeg4ip/mpeg4ip.spec, mpeg4ip/gcc44.patch (NEW) - gcc44.patch, bu...

[glen]

Author: glen                         Date: Tue Aug 25 17:10:00 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- gcc44.patch, build without (obsolete mpeg2dec); rel 7

---- Files affected:
packages/mpeg4ip:
   mpeg4ip.spec (1.63 -> 1.64) , gcc44.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mpeg4ip/mpeg4ip.spec
diff -u packages/mpeg4ip/mpeg4ip.spec:1.63 packages/mpeg4ip/mpeg4ip.spec:1.64
--- packages/mpeg4ip/mpeg4ip.spec:1.63	Fri Jun 12 00:05:26 2009
+++ packages/mpeg4ip/mpeg4ip.spec	Tue Aug 25 19:09:54 2009
@@ -1,4 +1,9 @@
 # $Revision$, $Date$
+# TODO
+# revision 1.34
+# - mpeg2dec.spec is obsoleted, port/find replacement?
+#   date: 2009/07/14 19:46:33;  author: arekm;  state: dead;  lines: +4 -1;  kopt: kv;  commitid: 76ee4a5ce098bfaa;  filename: mpeg2dec.spec;
+#    - obsolete by libmpeg2
 #
 # Conditional build:
 %bcond_without	alsa	# build without ALSA support in SDLAudio
@@ -7,7 +12,7 @@
 Summary(pl.UTF-8):	MPEG4IP - system kodowania, streamingu i odtwarzania dźwięku i obrazu MPEG-4
 Name:		mpeg4ip
 Version:	1.6.1
-Release:	6
+Release:	7
 Epoch:		1
 License:	MPL v1.1 (original code) and other licenses (included libraries)
 Group:		Applications
@@ -21,6 +26,7 @@
 Patch3:		%{name}-configure.patch
 Patch4:		%{name}-audio_l16.cpp-typo.patch
 Patch5:		%{name}-ffmpeg.patch
+Patch6:		gcc44.patch
 URL:		http://www.mpeg4ip.net/
 BuildRequires:	SDL-devel
 BuildRequires:	a52dec-libs-devel
@@ -39,13 +45,12 @@
 BuildRequires:	libtool >= 2:1.4d
 BuildRequires:	libvorbis-devel >= 1:1.0
 BuildRequires:	libx264-devel
-BuildRequires:	mpeg2dec-devel
+#BuildRequires:	mpeg2dec-devel
 %ifarch %{ix86} %{x8664}
 BuildRequires:	nasm >= 0.98.19
 %endif
 BuildRequires:	pkgconfig
 BuildRequires:	srtp-devel >= 1.4.2
-#BuildRequires:	srtp-devel >= 1.5
 BuildRequires:	xvid-devel >= 1:1.0.0
 BuildConflicts:	faad2 < 2.0-3
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
@@ -109,6 +114,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 cd lib/SDLAudio
@@ -252,6 +258,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2009/08/25 17:09:54  glen
+- gcc44.patch, build without (obsolete mpeg2dec); rel 7
+
 Revision 1.63  2009/06/11 22:05:26  marcus
 - added BR artsc-devel
 

================================================================
Index: packages/mpeg4ip/gcc44.patch
diff -u /dev/null packages/mpeg4ip/gcc44.patch:1.1
--- /dev/null	Tue Aug 25 19:10:00 2009
+++ packages/mpeg4ip/gcc44.patch	Tue Aug 25 19:09:54 2009
@@ -0,0 +1,29 @@
+--- mpeg4ip-1.6.1/include/mpeg4ip.h~	2006-08-07 21:27:00.000000000 +0300
++++ mpeg4ip-1.6.1/include/mpeg4ip.h	2009-08-25 19:16:50.675218747 +0300
+@@ -120,14 +120,6 @@
+ #endif
+ #include <sys/param.h>
+ 
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char *strcasestr(const char *haystack, const char *needle);
+-#ifdef __cplusplus
+-}
+-#endif
+-
+ #define OPEN_RDWR O_RDWR
+ #define OPEN_CREAT O_CREAT 
+ #define OPEN_RDONLY O_RDONLY
+--- mpeg4ip-1.6.1/player/src/media_utils.cpp~	2007-03-29 21:52:19.000000000 +0300
++++ mpeg4ip-1.6.1/player/src/media_utils.cpp	2009-08-25 20:04:15.872642682 +0300
+@@ -605,7 +605,8 @@
+ 				  int have_audio_driver,
+ 				  control_callback_vft_t *cc_vft)
+ {
+-  char *slash, *cm;
++  const char *slash;
++  char *cm;
+   uint64_t prog;
+   session_desc_t *sdp;
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mpeg4ip/mpeg4ip.spec?r1=1.63&r2=1.64&f=u