SPECS: mplayer.spec - build with internal ffmpeg libs; rel 6

[glen]

Author: glen                         Date: Tue Feb 19 00:31:21 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build with internal ffmpeg libs; rel 6

---- Files affected:
SPECS:
   mplayer.spec (1.393 -> 1.394) 

---- Diffs:

================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.393 SPECS/mplayer.spec:1.394
--- SPECS/mplayer.spec:1.393	Sun Feb 17 17:06:35 2008
+++ SPECS/mplayer.spec	Tue Feb 19 01:31:15 2008
@@ -57,6 +57,7 @@
 %bcond_with	amr		# enable 3GPP Adaptive Multi Rate (AMR) speech codec support
 %bcond_without	gnomess		# disable controling gnome screensaver
 %bcond_with	ssse3	# sse3 optimizations (needs binutils >= 2.16.92)
+%bcond_with	system_ffmpeg	# use ffmpeg-devel, rather bundled sources (needs more work or mplayer snapshot)
 
 %ifnarch %{ix86}
 %undefine	with_win32
@@ -75,7 +76,7 @@
 %endif
 
 %define		subver	rc2
-%define		rel		5.5
+%define		rel		6
 
 Summary:	MPlayer - THE Movie Player for UN*X
 Summary(de.UTF-8):	MPlayer ist ein unter der freien GPL-Lizenz stehender Media-Player
@@ -148,7 +149,7 @@
 %{?with_esd:BuildRequires:	esound-devel}
 BuildRequires:	faac-devel
 %{?with_faad:BuildRequires:	faad2-devel >= 2.0}
-BuildRequires:	ffmpeg-devel >= 0.4.9-3.20070626.1.1
+%{?with_system_ffmpeg:BuildRequires:	ffmpeg-devel >= 0.4.9-3.20070626.1.1}
 BuildRequires:	freetype-devel
 BuildRequires:	fribidi-devel
 %{?with_vidix:BuildRequires:	vidix-devel}
@@ -341,7 +342,7 @@
 	patch -p0 < $a
 done
 
-%patch22 -p1
+%{?with_system_ffmpeg:%patch22 -p1}
 %patch23 -p1
 %patch24 -p0
 cd stream
@@ -353,6 +354,11 @@
 sed -e '/Delete this default/d' etc/example.conf > etc/mplayer.conf
 rm -f font-*/runme
 
+%if %{with system_ffmpeg}
+# using external ffmpeg, but mplayer adds these to includepath
+rm -rf libavcodec libavdevice libavformat libavutil libpostproc libswscale
+%endif
+
 %build
 %if %{with shared}
 CFLAGS="%{rpmcflags} -fPIC"
@@ -372,6 +378,7 @@
 	--with-extraincdir=%{_includedir}/xvid \
 	--with-extralibdir=%{?_x_libraries}%{!?_x_libraries:%{_libdir}} \
 	--enable-menu \
+%if %{with system_ffmpeg}
 	--disable-libavutil_a \
 	--disable-libavcodec_a \
 	--disable-libavformat_a \
@@ -380,6 +387,7 @@
 	--enable-libavcodec_so \
 	--enable-libavformat_so \
 	--enable-libpostproc_so \
+%endif
 %ifnarch %{ix86} %{x8664}
 	--disable-mmx \
 	--disable-mmxext \
@@ -598,6 +606,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.394  2008-02-19 00:31:15  glen
+- build with internal ffmpeg libs; rel 6
+
 Revision 1.393  2008-02-17 16:06:35  glen
 - skins/default ghost is back, install re-entrancy, formatting
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mplayer.spec?r1=1.393&r2=1.394&f=u