updated self-build-vlc-vl.spec, vlc-vl.spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2650 ec354946-7b23-47d6-9f5a-488ba84defc7

nonfree/self-build-vlc/self-build-vlc-vl.spec

@@ -1,6 +1,6 @@
 %define pkgname vlc
 %define name    self-build-%{pkgname}
-%define version 1.1.6
+%define version 1.1.7
 %define release 1%{?_dist_release}
 
 %define with_mozilla	 		0
@@ -24,9 +24,14 @@ Obsoletes:	vlc-devel < 1.1.0
 Source0:	%{pkgname}-vl.spec
 
 Source100:      vlc-1.1.0-vlc-cache-gen_noerror.patch
-Source101:	0001-Libnotify-depends-on-a-gtk.patch
-Source103:	vlc-1.1.4-hardode_font_patch.patch
+#Source101:	0001-Libnotify-depends-on-a-gtk.patch
+Source103:	vlc-1.1.6-hardode_font_patch.patch
 Source104:	vlc-1.1.4-tls_path.patch
+#Source105:	vlc-backport-lirc_fix.patch
+#Source106:	vlc-backport-signal_fix.patch
+
+## vine
+Source150:	vlc-1.1.7-revert-pulse-c.patch
 
 License:	GPLv2+
 Group:		Restricted Software
@@ -72,6 +77,9 @@ Requires(post):	libtheora-devel
 Requires(post):  libtiff-devel
 Requires(post):  libupnp-devel
 Requires(post):	libv4l-devel
+%if %{?_dist_release} == "vl6"
+Requires(post):	libva-devel
+%endif
 Requires(post):	libvorbis-devel
 Requires(post):  libxml2-devel
 %{?_with_lirc:Requires(post):	lirc}
@@ -119,9 +127,6 @@ Requires(post):  libraw1394-devel
 Requires: TrueType-dejavu
 
 ## vine
-%if %{?_dist_release} == "vl6"
-Requires(post):	libva-devel
-%endif
 Requires(post):	libgcrypt-devel
 Requires(post):	wx-gtk2-devel
 Requires:	mesa-libGL
@@ -216,7 +221,8 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %{__install} -m 644 \
-    %{SOURCE100} %{SOURCE101} %{SOURCE103} %{SOURCE104} \
+    %{SOURCE100} %{SOURCE103} %{SOURCE104} \
+    %{SOURCE150} \
     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 
@@ -234,6 +240,14 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 
 
 %changelog
+* Sat Feb 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.7-1
+- new upstream release
+- dropped upstreamed patches
+- applied a reverted patch to pulse.c for vl5
+
+* Fri Feb 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.6-2
+- backport lirc and signal fixes
+
 * Tue Feb 01 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.6-1
 - new upstream release
 - dropped temporarily BuildRequires: lirc

nonfree/self-build-vlc/vlc-vl.spec

@@ -14,7 +14,7 @@
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	1.1.6
+Version:	1.1.7
 Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -23,10 +23,15 @@ Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}
 # %if %with_internal_live555
 # Source2:	http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
 # %endif
-Patch0:          vlc-1.1.0-vlc-cache-gen_noerror.patch
-Patch1:		0001-Libnotify-depends-on-a-gtk.patch
-Patch3:		vlc-1.1.4-hardode_font_patch.patch
+Patch0:		vlc-1.1.0-vlc-cache-gen_noerror.patch
+#Patch1:		0001-Libnotify-depends-on-a-gtk.patch
+Patch3:		vlc-1.1.6-hardode_font_patch.patch
 Patch4:		vlc-1.1.4-tls_path.patch
+#Patch5:		vlc-backport-lirc_fix.patch
+#Patch6:         vlc-backport-signal_fix.patch
+
+## vine
+Patch50:	vlc-1.1.7-revert-pulse-c.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -89,6 +94,9 @@ BuildRequires:	libtheora-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libupnp-devel
 BuildRequires:	libv4l-devel
+%if %{?_dist_release} == "vl6"
+BuildRequires:	libva-devel
+%endif
 BuildRequires:	libvorbis-devel
 BuildRequires:  libxml2-devel
 #BuildRequires:	lirc-devel
@@ -170,9 +178,6 @@ BuildRequires:  libraw1394-devel
 Requires: TrueType-dejavu
 
 ## vine
-%if %{?_dist_release} == "vl6"
-BuildRequires:	libva-devel
-%endif
 BuildRequires:	libgcrypt-devel
 BuildRequires:	wx-gtk2-devel
 Requires:	mesa-libGL
@@ -251,7 +256,18 @@ VLC plugins for libdc1394
 # %setup -q -D -T -a 2 -n %{name}-%{_version}
 # %endif
 %patch0 -p1 -b .noerror
-#%patch1 -p1 -b .0dlopen
+#%patch1 -p1 -b .gtk23
+%patch3 -p1 -b .hardode_path
+%patch4 -p1 -b .tls_path
+#%patch5 -p1 -b .lirc_fix
+#%patch6 -p1 -b .signal_fix
+
+## vine
+%if %{?_dist_release} == "vl5"
+%patch50 -p1 -b .pulse
+%endif
+
+%__sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 
 %__rm modules/access/videodev2.h
 %__ln_s -f %{_includedir}/linux/videodev2.h modules/access/videodev2.h
@@ -274,6 +290,7 @@ VLC plugins for libdc1394
 
 %configure \
 	--disable-dependency-tracking		\
+	--with-pic				\
 	--disable-rpath				\
 	--enable-release			\
 	--with-binary-version=%{version}-%{release} \
@@ -308,7 +325,7 @@ VLC plugins for libdc1394
 	--enable-tarkin				\
 	--enable-theora				\
 	%{?_with_dirac:--enable-dirac}		\
-	%{?_with_libass:--enable-libass}	\
+	--enable-libass	\
 	--enable-shout				\
 	%{?_with_xcb:--enable-xcb}		\
 	--enable-svg				\
@@ -329,7 +346,7 @@ VLC plugins for libdc1394
 	--enable-xosd				\
 	--enable-fbosd				\
 	--enable-galaktos			\
-	%{?_with_lirc:--enable-lirc}		\
+	--enable-lirc		\
 %ifarch %{ix86}
 	--enable-loader				\
 %else
@@ -349,7 +366,6 @@ VLC plugins for libdc1394
 # sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
 %__make %{?_smp_mflags}
-#% __make
 
 
 %install
@@ -450,6 +466,15 @@ fi || :
 
 
 %changelog
+* Sat Feb 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.7-1
+- new upstream release
+- dropped upstreamed patches
+- applied a reverted patch to pulse.c for vl5
+
+* Fri Feb 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.6-2
+- backport lirc and signal fixes
+- revived BuildRequires: lirc
+
 * Tue Feb 01 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.6-1
 - new upstream release
 - dropped temporarily BuildRequires: lirc