updated self-build-vlc

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

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

@@ -1,7 +1,7 @@
 %define pkgname vlc
 %define name    self-build-%{pkgname}
-%define version 1.1.11
-%define release 2%{?_dist_release}
+%define version 1.1.12
+%define release 1%{?_dist_release}
 
 %define with_mozilla	 		0
 %define with_dc1394			0
@@ -26,7 +26,9 @@ Source0:	%{pkgname}-vl.spec
 Source100:      vlc-1.1.0-vlc-cache-gen_noerror.patch
 Source103:	vlc-1.1.6-hardode_font_patch.patch
 Source104:	vlc-1.1.4-tls_path.patch
-Source106:	vlc-1.1-backport_20110607.patch
+#Source105:         vlc-1.1.8-bugfix.opencv22.patch
+Source106:		0001-Fix-typo-in-vlc.desktop.patch
+#Source107:		0001-kate-do-not-access-the-renderer-if-it-fails-to-initi.patch
 
 ## vine
 Source150:	vlc-1.1.7-revert-pulse-c.patch
@@ -274,6 +276,9 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 
 
 %changelog
+* Sat Oct 15 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.12-1
+- new upstream release
+
 * Mon Sep 12 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.11-2
 - dropped Requires(post): svga-devel
 - added BuildArch: noarch

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

@@ -13,8 +13,8 @@
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	1.1.11
-Release:	2%{?_dist_release}
+Version:	1.1.12
+Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org/
@@ -30,7 +30,8 @@ Patch0:		vlc-1.1.0-vlc-cache-gen_noerror.patch
 Patch3:		vlc-1.1.6-hardode_font_patch.patch
 Patch4:		vlc-1.1.4-tls_path.patch
 #Patch5:         vlc-1.1.8-bugfix.opencv22.patch
-Patch6:         vlc-1.1-backport_20110607.patch
+Patch6:		0001-Fix-typo-in-vlc.desktop.patch
+#Patch7:		0001-kate-do-not-access-the-renderer-if-it-fails-to-initi.patch
 
 ## vine
 Patch50:	vlc-1.1.7-revert-pulse-c.patch
@@ -184,6 +185,9 @@ BuildRequires:  libraw1394-devel
 #Requires: dejavu-fonts
 Requires: TrueType-dejavu
 
+#For xdg-sreensaver
+#Requires: xdg-utils
+
 ## vine
 BuildRequires:	libgcrypt-devel
 BuildRequires:	wx-gtk2-devel
@@ -266,7 +270,9 @@ VLC plugins for libdc1394
 %patch3 -p1 -b .hardode_path
 %patch4 -p1 -b .tls_path
 #%patch5 -p1 -b .opencv22
-#%patch6 -p1
+sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
+%patch6 -p1
+#%patch7 -p1
 
 unzip %{SOURCE10}
 patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
@@ -429,8 +435,8 @@ fi || :
 
 
 %posttrans
-[ -f /var/lib/dbus/machine-id ] || \
-    %{_bindir}/dbus-uuidgen > /var/lib/dbus/machine-id
+#[ -f /var/lib/dbus/machine-id ] || \
+#    %{_bindir}/dbus-uuidgen > /var/lib/dbus/machine-id
 %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null || :
 
 %preun
@@ -476,6 +482,9 @@ fi || :
 
 
 %changelog
+* Sat Oct 15 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.12-1
+- new upstream release
+
 * Mon Sep 12 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.11-2
 - dropped BuildRequires: svga-devel