Author: qboosh Date: Tue Dec 5 00:01:27 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- reenabled caca and sdl
- added am patch, added hack to kill AM_PROG_AS hack (failed with recent
automake)
---- Files affected:
SPECS:
xine-lib.spec (1.191 -> 1.192)
---- Diffs:
================================================================
Index: SPECS/xine-lib.spec
diff -u SPECS/xine-lib.spec:1.191 SPECS/xine-lib.spec:1.192
--- SPECS/xine-lib.spec:1.191 Mon Dec 4 23:55:13 2006
+++ SPECS/xine-lib.spec Tue Dec 5 01:01:21 2006
@@ -6,7 +6,7 @@
%bcond_without aalib # don't build aalib video output plugin
%bcond_without alsa # don't build ALSA audio output plugin
%bcond_without arts # don't build aRts audio output plugin
-%bcond_with caca # don't build libcaca video output plugin
+%bcond_without caca # don't build libcaca video output plugin
%bcond_without directfb # don't build DirectFB video output plugin
%bcond_without dxr3 # don't build dxr3 video output and decode
plugins
%bcond_without dvd # don't build dvdnav stuff
@@ -17,7 +17,7 @@
%bcond_without opengl # don't build OpenGL video output plugin
%bcond_without pulseaudio # don't build pulseaudio output plugin
%bcond_without smb # don't build SMB input plugin
-%bcond_with sdl # don't build SDL video output plugin
+%bcond_without sdl # don't build SDL video output plugin
%bcond_without stk # don't build stk video output plugin
%bcond_with xvid # build xvid decode plugin [disabled in sources
at the moment]
%bcond_with vdr # build with vdr support
@@ -41,7 +41,8 @@
Patch0: %{name}-nolibs.patch
Patch1: %{name}-sparc.patch
Patch2: %{name}-win32-path.patch
-Patch3: %{name}-vdr.patch
+Patch3: %{name}-am.patch
+Patch4: %{name}-vdr.patch
URL: http://xine.sourceforge.net/
%{?with_directfb:BuildRequires: DirectFB-devel >= 0.9.22}
%{?with_fusionsound:BuildRequires: FusionSound-devel >= 0.9.23}
@@ -707,7 +708,11 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%{?with_vdr:%patch3 -p1}
+%patch3 -p1
+%{?with_vdr:%patch4 -p1}
+
+# kill hack, it fails with recent automake
+echo 'AC_DEFUN([AM_PROG_AS_MOD],[AM_PROG_AS])' > m4/as.m4
%build
%{__libtoolize}
@@ -1049,6 +1054,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.192 2006/12/05 00:01:21 qboosh
+- reenabled caca and sdl
+- added am patch, added hack to kill AM_PROG_AS hack (failed with recent
automake)
+
Revision 1.191 2006/12/04 22:55:13 qboosh
- unified smb bcond with mplayer (s/samba/smb/); use disable configure option
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/xine-lib.spec?r1=1.191&r2=1.192&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
