rpms/vlc/F-18 vlc-2.0.4-cache.patch,NONE,1.1 vlc.spec,1.162,1.163

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15754/F-18

Modified Files:
	vlc.spec 
Added Files:
	vlc-2.0.4-cache.patch 
Log Message:
Enable Opus


vlc-2.0.4-cache.patch:
 Makefile.am |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE vlc-2.0.4-cache.patch ---
diff -up vlc-2.0.4/bin/Makefile.am.cache vlc-2.0.4/bin/Makefile.am
--- vlc-2.0.4/bin/Makefile.am.cache	2011-12-08 19:00:25.000000000 +0100
+++ vlc-2.0.4/bin/Makefile.am	2012-10-19 23:14:23.302736639 +0200
@@ -80,7 +80,5 @@ MOSTLYCLEANFILES = $(noinst_DATA)
 ../modules/plugins.dat: vlc-cache-gen$(EXEEXT)
 	$(AM_V_at)rm -f ../modules/plugins.dat
 	$(AM_V_GEN)if test "$(build)" = "$(host)"; then \
-		./vlc-cache-gen$(EXEEXT) ../modules ; \
-	else \
-		echo "Cross-compilation: cache generation skipped!" ; \
+		echo "Builder compilation: cache generation skipped!" ; \
 	fi


Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-18/vlc.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- vlc.spec	19 Oct 2012 14:41:59 -0000	1.162
+++ vlc.spec	19 Oct 2012 21:28:54 -0000	1.163
@@ -1,5 +1,5 @@
 #global vlc_rc                        -rc1
-#global _with_bootstrap		1
+%global _with_bootstrap		1
 %global _with_workaround_circle_deps 1
 %if 0%{?!_without_freeworld:1}
 %global _with_a52dec --with-a52dec
@@ -37,6 +37,7 @@
 URL:		http://www.videolan.org
 Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz
 Patch0:         vlc-2.0.2-xcb_discard.patch
+Patch1:		vlc-2.0.4-cache.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -120,6 +121,7 @@
 BuildRequires:	ncurses-devel
 %{?_with_opencv:BuildRequires: opencv-devel}
 BuildRequires:	openslp-devel
+Buildrequires:	opus-devel
 BuildRequires:	pcre-devel
 BuildRequires:	pulseaudio-libs-devel >= 0.9.8
 BuildRequires:	portaudio-devel
@@ -225,6 +227,7 @@
 touch -r config.h.in configure configure.ac
 }
 %endif
+%patch1 -p1 -b .vlc_cache
 
 %{?_with_bootstrap:
 rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -283,14 +286,14 @@
 	--enable-ncurses			\
 	--enable-fbosd				\
 	--enable-lirc				\
-%ifarch %{ix86}
+%if 0
 	--enable-loader				\
 %else
 	--without-contrib			\
 %endif
 
 
-%if 0
+%if 1
 # remove rpath from libtool
 sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -328,7 +331,7 @@
 
 #Clear execstak
 %ifarch %{ix86}
-execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/libdmo_plugin.so
+#execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/libdmo_plugin.so
 execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/librealvideo_plugin.so
 %endif
 
@@ -513,6 +516,9 @@
 %changelog
 * Fri Oct 19 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.0.4-1
 - Update to 2.0.4
+- Enable opus
+- Disable x86 loader
+- Avoid rpath
 
 * Wed Sep 26 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.0.3-3
 - Fix --with fluidsynth typo