updated some self-build packages

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

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

@@ -2,7 +2,7 @@
 
 Name:           avidemux
 Version:        2.5.2
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 Summary:        Graphical video editing and transcoding tool
 
 Group:          Applications/Multimedia
@@ -151,13 +151,13 @@ This package contains files required to develop with or extend %{name}.
 
 # change hardcoded libdir paths
 %ifarch x86_64 ppc64
-sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/ADM_core/src/ADM_fileio.cpp
+%__sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/ADM_core/src/ADM_fileio.cpp
-sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/main.cpp
+%__sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/main.cpp
 %endif
 
 %patch0 -p1 -b .parallel
 %patch1 -p1 -b .pulse
-%patch2 -p1 -b .qt4
+#%patch2 -p1 -b .qt4
 %patch3 -p1 -b .i18n
 %patch4 -p1 -b .altivec
 %patch5 -p1 -b .cfincludes
@@ -188,15 +188,15 @@ find %{_pkgbuilddir}/build/avidemux -name '*.so*' | \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
 # Temporary workaround since the i18n files aren't being built
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
+%__mkdir_p $RPM_BUILD_ROOT/%{_datadir}/%{name}
 
-make -C build install DESTDIR=$RPM_BUILD_ROOT
+%__make -C build install DESTDIR=$RPM_BUILD_ROOT
-make -C build_plugins install DESTDIR=$RPM_BUILD_ROOT
+%__make -C build_plugins install DESTDIR=$RPM_BUILD_ROOT
 # Install the build configuration for devel package
-install -d -m755 $RPM_BUILD_ROOT%{_includedir}
+%__install -d -m755 $RPM_BUILD_ROOT%{_includedir}
-install -m644 build/config/ADM_coreConfig.h $RPM_BUILD_ROOT%{_includedir}/ADM_coreConfig.h
+%__install -m644 build/config/ADM_coreConfig.h $RPM_BUILD_ROOT%{_includedir}/ADM_coreConfig.h
 
 # Find and remove all la files
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec %__rm -f {} ';'
@@ -206,9 +206,11 @@ desktop-file-install --vendor vine \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     %{SOURCE1}
 
+%if %{?with_qt_ui:1} %{!?with_qt_ui:0}
 desktop-file-install --vendor vine \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     %{SOURCE2}
+%endif
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec %__rm -f {} ';'
 %find_lang %{name}
@@ -221,7 +223,7 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec %__rm -f {} ';'
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog History README TODO
+%doc AUTHORS COPYING README TODO
 %{_datadir}/%{name}/
 %{_datadir}/ADM_scripts/
 %{_libdir}/libADM*
@@ -250,6 +252,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec %__rm -f {} ';'
 
 
 %changelog
+* Sat Jun 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2.5.2-3
+- unapply avidemux-2.4-qt4.patch
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2.5.2-2
 - change release to sync with self-build-avidemux
 

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

@@ -1,7 +1,7 @@
 %define pkgname avidemux
 %define name    self-build-%{pkgname}
 %define version 2.5.2
-%define release 2%{?_dist_release}
+%define release 3%{?_dist_release}
 
 %define source0path	%{pkgname}/%{pkgname}_%{version}.tar.gz
 
@@ -61,8 +61,12 @@ Requires(post):  self-build-ffmpeg
 Requires(post):  desktop-file-utils
 Requires(post):  gtk2-devel >= 2.8.0
 Requires(post):  cairo-devel
+
+%if %{?with_qt_ui:1} %{!?with_qt_ui:0}
 Requires(post):  qt4-devel
 Requires(post):  qt4-designer
+%endif
+
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -154,13 +158,16 @@ Avidemux は簡単なカット，フィルターリング，エンコード作
 
 %posttrans
 /usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
-    http://download{,2}.berlios.de/%{source0path} 3110000
+    http://download{,2}.berlios.de/%{source0path} 3126000
 
 %files
 %defattr(-,root,root)
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jun 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2.5.2-3
+- change release to sync with avidemux-vl.spec
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2.5.2-2
 - renamed %%{Source0} to avidemux-vl.spec
 

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

@@ -1,15 +1,18 @@
 #TODO: Build with openjpeg
-%define name	ffmpeg
+#TODO: add make test to %%check section
-%define version	0.6
+
-%define svndate	20100410
+#% define svndate	20100625
-%define release	1%{?svndate:.%svndate}%{?_dist_release}
+## available for v0.6 or lower
+%define with_libfaad 1
+
+%define with_vaapi 1
+#% define with_libvpx 1
 
 Summary:	Digital VCR and streaming server
-Name:		%{name}
+Name:		ffmpeg
-Version:	%{version}
+Version:	0.6
-Release:	%{release}
+Release:	2%{?svndate:.%svndate}%{?_dist_release}
-#Source:		%{name}-%{version}.tar.bz2
+Source:		%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
-Source:		%{name}-%{?svndate:%svndate}.tar.bz2
 Source1:        %{name}-snapshot.sh
 
 # pre-built man files
@@ -18,21 +21,22 @@ Source91:       ffplay.1.gz
 Source92:       ffserver.1.gz
 Source93:       ffprobe.1.gz
 
-# get rid of textrels on x86_64 in yasm code (from RPM Fusion)
-#Patch0:         %{name}-textrel.patch
-
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://ffmpeg.org/
 
 BuildRequires:  bzip2-devel
+##BuildRequires:  dirac-devel
 BuildRequires:	gsm-devel
 BuildRequires:	imlib2-devel
 BuildRequires:	libdc1394-devel
 BuildRequires:	libraw1394-devel
 BuildRequires:	libtheora-devel
+%{?with_vaapi:BuildRequires:libva-devel}
+%{?with_libvpx:BuildRequires:  libvpx-devel}
 BuildRequires:  libvdpau-devel
 BuildRequires:	libvorbis-devel
+%{?_with_opencore_amr:BuildRequires: opencore-amr-devel}
 ##BuildRequires:  openjpeg-devel
 BuildRequires:	SDL-devel
 BuildRequires:  speex-devel
@@ -48,6 +52,8 @@ BuildRequires:	yasm
 #BuildRequires: x264-devel, libdca-devel, a52dec-devel
 #BuildRequires: faad2-devel
 
+Requires:	%{name}-libs = %{version}-%{release}
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -57,7 +63,6 @@ VCR. It can encode in real time in many formats including MPEG1 audio
 and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
 
 %package libs
-Group: System Environment/Libraries
 Summary: Libraries for %{name}
 Group: System Environment/Libraries
 
@@ -85,7 +90,7 @@ This package contains development files for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{svndate}
+%setup -q -n %{name}-%{?svndate:%svndate}%{!?svndate:%version}
 #% setup -q
 #%patch0 -p1 -b .textrel
 
@@ -114,14 +119,17 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
     --enable-bzlib \
     --enable-libdc1394 \
     --enable-libfaac --enable-nonfree \
-    --enable-libfaad \
+    %{?with_libfaad:--enable-libfaad} \
     --enable-libgsm \
     --enable-libmp3lame \
     %{?_with_openjpeg:--enable-libopenjpeg} \
     --enable-libtheora \
     --enable-libvorbis \
+    %{?with_libvpx:--enable-libvpx} \
     --enable-libx264 \
     --enable-libxvid \
+    --enable-zlib \
+    \
     --enable-x11grab \
     --enable-avfilter \
     --enable-avfilter-lavf \
@@ -131,6 +139,7 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
     --disable-static \
     --enable-shared \
     --enable-gpl \
+    --disable-doc \
     --disable-debug \
     --disable-stripping
 
@@ -176,6 +185,9 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 
 %changelog
+* Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.6-2
+- new upstream release
+
 * Sun Apr 18 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.6-1.20100410
 - bumped version to pre-0.6
 

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

@@ -7,8 +7,14 @@
 %define pkgname ffmpeg
 %define name	self-build-%{pkgname}
 %define version 0.6
-%define svndate	20100410
+#% define svndate	20100625
-%define release	1%{?svndate:.%svndate}%{?_dist_release}
+%define release	2%{?svndate:.%svndate}%{?_dist_release}
+
+## available for v0.6 or lower
+%define with_libfaad 1
+
+%define with_vaapi 1
+#% define with_libvpx 1
 
 Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
@@ -16,8 +22,7 @@ Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
-#Source1:		%{pkgname}-%{version}.tar.bz2
+Source1:	%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
-Source1:		%{pkgname}-%{?svndate:%svndate}.tar.bz2
 Source2:        %{pkgname}-snapshot.sh
 Source90:	ffmpeg.1.gz
 Source91:	ffplay.1.gz
@@ -38,7 +43,10 @@ Requires(post):	libdc1394-devel
 Requires(post):	libraw1394-devel
 Requires(post):	libtheora-devel
 Requires(post):  libvdpau-devel
+%{?with_vaapi:BuildRequires:libva-devel}
+%{?with_libvpx:BuildRequires:  libvpx-devel}
 Requires(post):	libvorbis-devel
+%{?_with_opencore_amr:BuildRequires: opencore-amr-devel}
 ##Requires(post):  openjpeg-devel
 Requires(post):	SDL-devel
 Requires(post):  speex-devel
@@ -55,7 +63,6 @@ Requires(post):		self-build-x264
 Requires(post):		self-build-libdca
 Requires(post):		self-build-a52dec
 Requires(post):		self-build-faad2
-%{?_with_amr:Requires(post):		amrnb-devel amrwb-devel}
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -142,7 +149,7 @@ MPEG4, h263, ac3, asf, avi, real, mjpeg, flash を含む
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec 82000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec 77000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-libs-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
@@ -173,6 +180,9 @@ Rebuild_gpac_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.6-2
+- new upstream release
+
 * Sun Apr 18 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.6-1.20100410
 - bumped version to pre-0.6
 - updated source snapshot 20100410

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

@@ -3,7 +3,7 @@
 Name:        gpac
 Summary:     MPEG-4 multimedia framework
 Version:     0.4.5
-Release:     8%{?_dist_release}
+Release:     9%{?_dist_release}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 URL:         http://gpac.sourceforge.net/
@@ -42,7 +42,7 @@ BuildRequires:  libXv-devel
 #BuildRequires:  wxGTK-devel
 BuildRequires:  xmlrpc-epi-devel
 %{?_with_mozilla:BuildRequires: gecko-devel}
-BuildRequires:  doxygen
+#BuildRequires:  doxygen
 BuildRequires:  desktop-file-utils
 %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
 # *-devel packages provided by other self-build-* should only be listed
@@ -117,10 +117,10 @@ Static library for gpac.
 #define soname libgpac.so.0
 #sed -i.soname -e 's|EXTRALIBS+=$(GPAC_SH_FLAGS)|EXTRALIBS+=$(GPAC_SH_FLAGS)\nLDFLAGS+="-Wl,-soname,%{soname}"|' src/Makefile
 
-# Update doxygen
+# # Update doxygen
-pushd doc
+# pushd doc
-doxygen -u
+# doxygen -u
-popd
+# popd
 
 # Fix encoding warnings
 cp -p Changelog Changelog.origine
@@ -156,10 +156,10 @@ chmod +x configure
 %__make sggen OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" 
 #{?_smp_mflags}
 
-## kwizart - build doxygen doc for devel
+# ## kwizart - build doxygen doc for devel
-pushd doc
+# pushd doc
-doxygen
+# doxygen
-popd
+# popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -176,8 +176,8 @@ for b in MPEG4 SVG X3D; do
   popd
 done
 
-#Fix doxygen timestamp
+# #Fix doxygen timestamp
-touch -r Changelog doc/html/*
+# touch -r Changelog doc/html/*
 
 
 %clean
@@ -218,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.5-9
+- removed doxygen support
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.5-8
 - change release to sync with self-build-gpac
 

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

@@ -1,7 +1,7 @@
 %define pkgname gpac
 %define name	self-build-%{pkgname}
 %define version 0.4.5
-%define release	8%{?_dist_release}
+%define release	9%{?_dist_release}
 
 %define sourceurl0	http://prdownloads.sourceforge.net/gpac/%{pkgname}-%{version}.tar.gz
 #% define sourceurl0	http://dl.sourceforge.net/sourceforge/gpac/%{pkgname}-%{version}.tar.gz
@@ -22,7 +22,6 @@ Source106:      gpac-0.4.5-shared_sggen.patch
 Source107:      gpac-0.4.5-libxml2.patch
 Source108:      gpac-ppc64.patch
 Source109:      gpac-0.4.5-ffmpeg.patch
-Source150:      gpac-0.4.5-mozjs-vine.patch
 
 License:	LGPLv2+
 Group:		Restricted Software
@@ -49,7 +48,7 @@ Requires(post):  libXv-devel
 #Requires(post):  wxGTK-devel
 Requires(post):  xmlrpc-epi-devel
 %{?_with_mozilla:Requires(post): gecko-devel}
-Requires(post):  doxygen
+#Requires(post):  doxygen
 Requires(post):  desktop-file-utils
 %{?_with_amr:Requires(post): amrnb-devel amrwb-devel}
 Requires(post):  self-build-a52dec
@@ -156,7 +155,7 @@ for MP4 and 3GPP(2) files and many tools for scene descriptions
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 370000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 169000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-libs-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release} \
@@ -167,6 +166,9 @@ for MP4 and 3GPP(2) files and many tools for scene descriptions
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.5-9
+- dropped Requires(post):  doxygen
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.5-8
 - renamed %%{Source0} to gpac-vl.spec
 

nonfree/self-build-gstreamer-plugins-bad/gstreamer-plugins-bad-vl.spec

@@ -6,7 +6,7 @@
 
 Summary: GStreamer streaming media framework "bad" plug-ins
 Name: gstreamer-plugins-bad
-Version: 0.10.18
+Version: 0.10.19
 Release: 1%{?_dist_release}
 # The freeze and nfs plugins are LGPLv2 (only)
 License: LGPLv2+
@@ -143,8 +143,8 @@ enough quality.
 %files -f gst-plugins-bad-%{majorminor}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README REQUIREMENTS
-%{_bindir}/gst-camera
+# %{_bindir}/gst-camera
-%{_bindir}/gst-camera-perf
+# %{_bindir}/gst-camera-perf
 %{_libdir}/*.so.*
 %{_libdir}/gstreamer-%{majorminor}/*.so
 #%{_datadir}/gstreamer-0.10/presets/GstX264Enc.prs
@@ -253,6 +253,9 @@ enough quality.
 
 
 %changelog
+* Sun Jun 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.10.19-1
+- new upstream release
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.10.18-1
 - new upstream release
 - added BuildRequires: libvdpau-devel

nonfree/self-build-gstreamer-plugins-bad/self-build-gstreamer-plugins-bad-vl.spec

@@ -3,7 +3,7 @@
 %define gstreamer    gstreamer
 %define gst_minver   0.10.22.1
 %define gstpb_minver 0.10.22.1
-%define _gst_ver     0.10.18
+%define _gst_ver     0.10.19
 %define release	1%{?_dist_release}
 
 %define sourceurl	http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{_gst_ver}.tar.bz2
@@ -155,7 +155,7 @@ gstreamer-plugins-bad は GStreamer ストリーミングメディア
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec %{sourceurl} 100000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec %{sourceurl} 269000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -165,6 +165,9 @@ gstreamer-plugins-bad は GStreamer ストリーミングメディア
 %{_datadir}/%{name}
 
 %changelog
+* Sun Jun 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.10.19-1
+- new upstream release
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.10.18-1
 - new upstream release
 - renamed %%{Source0} to gstreamer-plugins-bad-vl.spec

nonfree/self-build-gstreamer-plugins-ugly/gstreamer-plugins-ugly-vl.spec

@@ -1,7 +1,7 @@
 ## TODO: build with opencore-amr
 
 %define major		0.10
-%define _gst_ver	0.10.14
+%define _gst_ver	0.10.15
 %define _gstpb_ver	0.10.3
 %define pkg_release	1%{?_dist_release}
 
@@ -29,8 +29,12 @@ BuildRequires:	gstreamer-plugins-base-devel >= %{_gstpb_ver}
 #BuildRequires:	gtk-doc >= 1.3
 BuildRequires:	python >= 2.1, python-pyxml
 BuildRequires:	glib2-devel >= 2.6
-BuildRequires:	liboil-devel >= 0.3.0
+BuildRequires:  twolame-devel
 BuildRequires:	libid3tag-devel >= 0.15
+BuildRequires:	liboil-devel >= 0.3.0
+BuildRequires:  libcdio-devel >= 0.82
+BuildRequires:  libdvdread-devel
+BuildRequires:  PyXML
 
 # *-devel packages provided by other self-build-* should only be listed
 # in self-build-%{name}.spec as PreReq.
@@ -117,7 +121,7 @@ GStreamer はメディアデータ操作用の filter graph をベースにし
 %doc AUTHORS ChangeLog COPYING NEWS README RELEASE REQUIREMENTS
 %{_datadir}/gstreamer-%{major}/presets
 # ugly plugins without external dependencies
-%{_libdir}/gstreamer-%{major}
+%{_libdir}/gstreamer-%{major}/*.so
 
 # ugly plugins with external dependencies, but in the main package
 # %{_libdir}/gstreamer-%{major}/libgstmad.so
@@ -128,6 +132,9 @@ GStreamer はメディアデータ操作用の filter graph をベースにし
 
 
 %changelog
+* Sun Jun 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.10.15-1
+- new upstream relase
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.10.14-1
 - new upstream relase
 

nonfree/self-build-gstreamer-plugins-ugly/self-build-gstreamer-plugins-ugly-vl.spec

@@ -1,5 +1,5 @@
 %define pkgname gstreamer-plugins-ugly
-%define _gst_ver	0.10.14
+%define _gst_ver	0.10.15
 %define _gstpb_ver	0.10.3
 %define release	1%{?_dist_release}
 
@@ -19,18 +19,25 @@ Requires(post):		self-build-setup >= 0.9.9
 
 # (build)requies of target package.
 Requires(post):		libogg-devel, libtheora-devel, libvorbis-devel
-Requires(post):		self-build-ffmpeg
 Requires(post):		gstreamer-devel >= %{_gst_ver}
 Requires(post):		gstreamer-plugins-base-devel >= %{_gstpb_ver}
 #Requires(post):		gtk-doc >= 1.3
 Requires(post):		python >= 2.1, python-pyxml
 Requires(post):		glib2-devel >= 2.6
+Requires(post):		twolame-devel
 Requires(post):		liboil-devel >= 0.3.0
+Requires(post):		libcdio-devel >= 0.82
+Requires(post):		libdvdread-devel
+Requires(post):		PyXML
 Requires(post):		self-build-libmad >= 0.15
 Requires(post):		libid3tag-devel >= 0.15
+Requires(post):		self-build-ffmpeg
+Requires(post):		self-build-x264
 Requires(post):		self-build-libmpeg2
 Requires(post):		self-build-a52dec
 Requires(post):		self-build-lame
+Requires(post):		self-build-libmad
+
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -115,13 +122,16 @@ gstreamer-plugins-ugly は GStreamer ストリーミングメディア
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec %{sourceurl} 35000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec %{sourceurl} 81000
 
 %files
 %defattr(-,root,root)
 %{_datadir}/%{name}
 
 %changelog
+* Sun Jun 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.10.15-1
+- new upstream relase
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.10.14-1
 - new upstream relase
 - renamed %%{Source0} to gstreamer-plugins-ugly-vl.spec

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

@@ -1,14 +1,12 @@
 ## -*- coding: utf-8-unix -*-
-%define real_name libdvbpsi5
-
 Summary: 	Library for MPEG TS and DVB PSI tables decoding and generation
 Name: 		libdvbpsi
-Version: 	0.1.6
+Version: 	0.1.7
-Release: 	2%{?_dist_release}
+Release: 	1%{?_dist_release}
 License: 	GPLv2+
 Group: 		System Environment/Libraries
 URL: 		http://www.videolan.org/developers/libdvbpsi.html
-Source0: 	http://download.videolan.org/pub/libdvbpsi/%{version}/%{real_name}-%{version}.tar.bz2
+Source0: 	http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	graphviz doxygen
 
@@ -27,7 +25,7 @@ MPEG TS and DVB PSI table decoding and generation.
 This package contains development files for %{name}
 
 %prep
-%setup -q -n %{real_name}-%{version}
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -61,9 +59,13 @@ This package contains development files for %{name}
 %doc doc/doxygen/html
 %{_includedir}/dvbpsi/
 %{_libdir}/lib*.so
+%{_libdir}/pkgconfig/libdvbpsi.pc
 
 
 %changelog
+* Sun Jun 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.1.7-1
+- updated to 0.1.7
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.1.6-2
 - change release to sync with self-build-libdvbpsi
 

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

@@ -1,11 +1,9 @@
 %define pkgname libdvbpsi
 %define name	self-build-%{pkgname}
-%define version 0.1.6
+%define version 0.1.7
-%define release	2%{?_dist_release}
+%define release	1%{?_dist_release}
 
-%define real_name libdvbpsi5
+%define sourceurl0	http://download.videolan.org/pub/libdvbpsi/%{version}/%{pkgname}-%{version}.tar.bz2
-
-%define sourceurl0	http://download.videolan.org/pub/libdvbpsi/%{version}/%{real_name}-%{version}.tar.bz2
 
 Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
@@ -102,7 +100,7 @@ libdvbpsi は MPEG TS と DVB PSI テーブル復号と生成のために設計
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 95000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 92000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -111,6 +109,9 @@ libdvbpsi は MPEG TS と DVB PSI テーブル復号と生成のために設計
 %{_datadir}/%{name}
 
 %changelog
+* Sun Jun 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.1.7-1
+- updated to 0.1.7
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.1.6-2
 - renamed %%{Source0} to libdvbpsi-vl.spec
 

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

@@ -1,6 +1,6 @@
 Name:            libquicktime
-Version:         1.1.4
+Version:         1.1.5
-Release:         2%{?_dist_release}
+Release:         1%{?_dist_release}
 License:         LGPLv2+
 Group:           System Environment/Libraries
 Source0:         http://prdownloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
@@ -140,6 +140,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec rm -f {} \;
 
 
 %changelog
+* Sun Jun 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.5-1
+- new upstream release
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.4-2
 - change release to sync with self-build-libquicktime.spec
 

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

@@ -1,7 +1,7 @@
 %define pkgname libquicktime
 %define name	self-build-%{pkgname}
-%define version 1.1.4
+%define version 1.1.5
-%define release	2%{?_dist_release}
+%define release	1%{?_dist_release}
 
 %define sourceurl0	http://prdownloads.sourceforge.net/libquicktime/%{pkgname}-%{version}.tar.gz
 
@@ -131,7 +131,7 @@ YUV 4:2:2、YUV 4:2:0、オーディオエンコード：Ogg Vorbis、IMA4、ula
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 185000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 186000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -140,6 +140,9 @@ YUV 4:2:2、YUV 4:2:0、オーディオエンコード：Ogg Vorbis、IMA4、ula
 %{_datadir}/%{name}
 
 %changelog
+* Sun Jun 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.5-1
+- new upstream release
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.4-2
 - renamed %%{Source0} to libquicktime-vl.spec
 

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

@@ -1,20 +1,15 @@
 %define name	mplayer
 %define version	1.0
-#%%define extver	%{nil}
+%define extver	rc3
-%define extver	rc2
 #% define release	4%{?extver:.%{extver}}%{?_dist_release}
-%define svndate  20100401
+%define svndate  20100621
-%define release	33.%{svndate}%{?_dist_release}
+%define release	36.%{svndate}%{?_dist_release}
 
 %if %{?_dist_release} == "vl6" || %{?_dist_release} == "vl5"
 %define ttfontdir   /usr/share/fonts
 %define ttfontlist  TrueType-vlgothic/VL-PGothic-Regular \\\
                     TrueType-sazanami-gothic/sazanami-gothic
 %endif
-%if %{?_dist_release} == "vl4"
-%define ttfontdir   /usr/X11R6/lib/X11/fonts/TrueType
-%define ttfontlist  VL-PGothic-Regular ipagp sazanami-gothic luxirr
-%endif
 
 Summary:	The Movie Player
 Summary(ja): 	動画プレイヤー
@@ -27,7 +22,6 @@ Source1:	http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
 Source10:       mplayer-snapshot.sh
 Patch2:         %{name}-config.patch
 Patch8:         %{name}-manlinks.patch
-Patch10:        %{name}-qcelp.patch
 Patch14:        %{name}-nodvdcss.patch
 
 License:	GPLv2+
@@ -41,6 +35,7 @@ BuildRequires:	alsa-lib-devel
 BuildRequires:	esound-devel
 BuildRequires:	cdparanoia-devel
 BuildRequires:	libvorbis-devel
+BuildRequires:  pulseaudio-lib-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	giflib-devel
@@ -50,6 +45,7 @@ BuildRequires:  libmpcdec-devel
 BuildRequires:  twolame-devel
 BuildRequires:  yasm
 BuildRequires:  libvdpau-devel
+BuildRequires:  libXinerama-devel
 BuildRequires:  libXScrnSaver-devel
 # *-devel packages provided by other self-build-* should only be listed
 # in self-build-%{name}.spec as PreReq.
@@ -69,11 +65,7 @@ Requires:	mesa-libGL
 BuildRequires:	xorg-x11-devel 
 BuildRequires:	mesa-libGL-devel
 %endif
-%if %{?_dist_release} == "vl4"
+
-Requires:	XOrg-gl
-BuildRequires:	XOrg-devel 
-BuildRequires:	XOrg-gl-devel
-%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 
@@ -121,7 +113,6 @@ MPlayer は何もしなくても DVD や MPEG-1/2/4 のように一般的なフ
 
 %patch2 -p1 -b .config
 %patch8 -p1 -b .manlinks
-%patch10 -p1 -b .qclp
 %patch14 -p1 -b .nodvdcss
 
 %build
@@ -241,6 +232,17 @@ done
 
 
 %changelog
+* Sun Jun 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-36.20100621
+- updated source snapshot 20100621
+
+* Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-35.20100615
+- updated source snapshot 20100615
+- added BuildRequires: libXinerama-devel
+- dropped vl4 support
+
+* Sun Apr 11 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-34.20100410
+- updated source snapshot 20100410
+
 * Fri Apr 02 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-33.20100401
 - updated source snapshot 20100401
 

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

@@ -1,10 +1,10 @@
 %define pkgname mplayer
 %define name	self-build-%{pkgname}
 %define version 1.0
-%define extver	rc2
+%define extver	rc3
 #% define release	4%{?extver:.%{extver}}%{?_dist_release}
-%define svndate  20100401
+%define svndate  20100621
-%define release	33.%{svndate}%{?_dist_release}
+%define release	36.%{svndate}%{?_dist_release}
 
 
 Summary:	Package to automatically build %{pkgname} rpm package
@@ -46,6 +46,7 @@ Requires(post):		libmpcdec-devel
 Requires(post):		twolame-devel
 Requires(post):		yasm
 Requires(post):		libvdpau-devel
+Requires(post):		libXinerama-devel
 Requires(post):		libXScrnSaver-devel
 Requires(post):		self-build-mplayer-codecs
 Requires(post):		self-build-libdvdcss
@@ -168,7 +169,7 @@ xorg-x11-drv-nvidia: VDPAU support
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec 1525000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec 603000
 
 
 %files
@@ -176,6 +177,11 @@ xorg-x11-drv-nvidia: VDPAU support
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-36.20100621
+- updated source snapshot 20100621
+- added Requires(post): libXinerama-devel
+- dropped vl4 support
+
 * Fri Apr 02 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-33.20100401
 - updated source snapshot 20100401
 

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

@@ -1,7 +1,7 @@
 %define pkgname vlc
 %define name    self-build-%{pkgname}
-%define version 1.0.5
+%define version 1.1.0
-%define release 3%{?_dist_release}
+%define release 1%{?_dist_release}
 
 %if %{?_dist_release} == "vl4"
 ## dummy echo
@@ -30,10 +30,7 @@ Obsoletes:	vlc-devel < 1.0.0
 Source0:	%{pkgname}-vl.spec
 
 Source10:       vlc-handlers.schemas
-Source100:      vlc-trunk-default_font-vine.patch
+Source100:      vlc-1.1.0-vlc-cache-gen_noerror.patch
-Source101:      0001-Default-libv4l2-to-true.patch
-Source103:      300_all_pic.patch
-Source104:      310_all_mmx_pic.patch
 
 License:	GPLv2+
 Group:		Restricted Software
@@ -125,6 +122,7 @@ Requires(post):  libraw1394-devel
 Requires: TrueType-dejavu
 
 ## vine
+Requires(post):	libva-devel
 Requires(post):	libgcrypt-devel
 Requires(post):	wx-gtk2-devel
 Requires:	mesa-libGL
@@ -220,7 +218,7 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 %{__install} -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %{__install} -m 644 \
-    %{SOURCE100} %{SOURCE101} %{SOURCE103} %{SOURCE104} \
+    %{SOURCE100} \
     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 
@@ -228,7 +226,7 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 2325000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 1195000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -238,6 +236,10 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 
 
 %changelog
+* Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.0-1
+- new upstream release
+- added Requires(post): libva-devel
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.5-3
 - renamed %%{Source0} to vlc-vl.spec
 

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

@@ -14,8 +14,8 @@
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	1.0.5
+Version:	1.1.0
-Release:	3%{?_dist_release}
+Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org/
@@ -24,11 +24,8 @@ Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}
 # Source2:	http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
 # %endif
 Source10:       vlc-handlers.schemas
-#Patch0:         vlc-trunk-default_font.patch
+Patch0:          vlc-1.1.0-vlc-cache-gen_noerror.patch
-Patch0:         vlc-trunk-default_font-vine.patch
+#Patch1:          vlc-1.1.0-bugfix-dlopen.patch
-Patch1:         0001-Default-libv4l2-to-true.patch
-Patch3:         300_all_pic.patch
-Patch4:         310_all_mmx_pic.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -172,6 +169,7 @@ BuildRequires:  libraw1394-devel
 Requires: TrueType-dejavu
 
 ## vine
+BuildRequires:	libva-devel
 BuildRequires:	libgcrypt-devel
 BuildRequires:	wx-gtk2-devel
 Requires:	mesa-libGL
@@ -249,12 +247,8 @@ VLC plugins for libdc1394
 # %if %with_internal_live555
 # %setup -q -D -T -a 2 -n %{name}-%{_version}
 # %endif
-%patch0 -p1 -b .default_font
+%patch0 -p1 -b .noerror
-%patch1 -p1 -b .istrue
+#%patch1 -p1 -b .0dlopen
-#http://trac.videolan.org/vlc/ticket/1383
-%patch3 -p1 -b .dmo_pic
-sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
-%patch4 -p1 -b .mmx_pic
 
 %__rm modules/access/videodev2.h
 %__ln_s -f %{_includedir}/linux/videodev2.h modules/access/videodev2.h
@@ -288,6 +282,7 @@ sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 	--enable-dc1394				\
 	--enable-dv				\
 %endif
+	--enable-libva				\
 	--enable-dvdread --enable-dvdnav \
 	%{?_with_opencv:--enable-opencv} \
 	--enable-v4l				\
@@ -336,6 +331,7 @@ sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 %if %with_mozilla 
 	--enable-mozilla			\
 %endif
+	--without-kde-solid			\
 	;
 
 # remove rpath from libtool
@@ -345,8 +341,8 @@ sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 # # clean unused-direct-shlib-dependencies
 # sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
-#% __make %{?_smp_mflags}
+%__make %{?_smp_mflags}
-%__make
+#% __make
 
 
 %install
@@ -356,15 +352,6 @@ sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
-%__install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
-%__install -pm 644 doc/vlc*.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
-for i in 16x16 32x32 48x48 128x128 ; do
-  %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps
-  %__install -pm 0644 share/vlc${i}.png \
-    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps/vlc.png
-done
-
 desktop-file-install --vendor vine			\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
 	--delete-original				\
@@ -436,9 +423,9 @@ fi || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README THANKS
+%doc AUTHORS COPYING ChangeLog NEWS README THANKS
 %{_datadir}/applications/*%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/vlc.png
+%{_datadir}/icons/hicolor/*/apps/*
 %{_bindir}/cvlc
 %{_bindir}/nvlc
 %{_bindir}/qvlc
@@ -470,6 +457,10 @@ fi || :
 
 
 %changelog
+* Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.0-1
+- new upstream release
+- added BuildRequires: libva-devel
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.5-3
 - change release to sync with self-build-vlc
 

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

@@ -1,9 +1,9 @@
 %define pkgname x264
 %define name	self-build-%{pkgname}
 %define version 0.0.0
-%define date	20100216
+%define date	20100625
 %define time	2245
-%define release	13.%{date}%{?_dist_release}
+%define release	14.%{date}%{?_dist_release}
 
 #define sourceurl0	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/%{pkgname}-snapshot-%{date}-%{time}.tar.bz2
 %define sourceurl0	http://www.videolan.org/pub/videolan/x264/snapshots/%{pkgname}-snapshot-%{date}-%{time}.tar.bz2
@@ -21,6 +21,9 @@ Source112:	%{pkgname}-nostrip.patch
 License:	GPLv2+
 Group:		Restricted Software
 
+Obsoletes:      x264 < %{version}-%{release}
+Obsoletes:      self-build-x264 < %{version}-%{release}
+
 Requires(post):		self-build-setup >= 0.9.9
 
 # (build)requies of target package.
@@ -108,7 +111,7 @@ x264 はスクラッチから書かれた H264/AVC ビデオストリームを
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 10000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 18000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -117,6 +120,9 @@ x264 はスクラッチから書かれた H264/AVC ビデオストリームを
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.0-14.20100625
+- updated source snapshot 20100625
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.0-13.20100216
 - renamed %%{Source0} to x264-vl.spec
 

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

@@ -1,27 +1,22 @@
-%define name x264
+%define date 20100625
-%define version 0.0.0
-%define date 20100216
 %define time 2245
-%define release 13.%{date}%{?_dist_release}
 
 Summary: Library for encoding and decoding H264/AVC video streams
-Name: %{name}
+Name: x264
-Version: %{version}
+Version: 0.0.0
-Release: %{release}
+Release: 14.%{date}%{?_dist_release}
+License: GPLv2+
+Group: System Environment/Libraries
+URL: http://www.videolan.org/developers/x264.html
 #Source: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/%{name}-snapshot-%{date}-%{time}.tar.bz2
 Source: http://www.videolan.org/pub/videolan/x264/snapshots/%{name}-snapshot-%{date}-%{time}.tar.bz2
 Source1: %{name}.desktop
 # # don't remove config.h and don't re-run version.sh
-# #Patch0: x264-nover.patch
+# Patch0: x264-nover.patch
-# Patch0: x264-nover-20100216.patch
 # link with shared libx264
 Patch1: x264-shared.patch
 # don't strip if configured with --enable-debug
 Patch2: x264-nostrip.patch
-License: GPLv2+
-Group: System Environment/Libraries
-URL: http://www.videolan.org/developers/x264.html
-
 %ifarch x86_64 %{ix86}
 BuildRequires: yasm
 %endif
@@ -31,6 +26,11 @@ BuildRequires: yasm
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
+Provides:       libx264 = %{version}
+Obsoletes:      libx264 < %{version}
+Obsoletes:      x264 < %{version}
+
+
 %description
 x264 is a free library for encoding H264/AVC video streams, written from
 scratch.
@@ -45,12 +45,11 @@ Requires: pkgconfig
 x264 is a free library for encoding H264/AVC video streams, written from
 scratch.
 
-This package contains header files, static library and API documentation 
+This package contains the development files.
-for the x264.
 
 %prep
 %setup -q -n %{name}-snapshot-%{date}-%{time}
-#% patch0 -p1 -b .nover
+# %patch0 -p1 -b .nover
 %patch1 -p1 -b .shared
 %patch2 -p1 -b .nostrip
 # AUTHORS file is in iso-8859-1
@@ -59,22 +58,26 @@ iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
 
 %build
 ./configure \
-	--host=%{_target_platform} \
+    --host=%{_target_platform} \
-	--prefix=%{_prefix} \
+    --prefix=%{_prefix} \
-	--exec-prefix=%{_exec_prefix} \
+    --exec-prefix=%{_exec_prefix} \
-	--bindir=%{_bindir} \
+    --bindir=%{_bindir} \
-	--includedir=%{_includedir} \
+    --includedir=%{_includedir} \
-	--libdir=%{_libdir} \
+    --libdir=%{_libdir} \
-	--extra-cflags="$RPM_OPT_FLAGS" \
+    --extra-cflags="$RPM_OPT_FLAGS" \
-	--enable-mp4-output \
+    --enable-mp4-output \
-	%{?_with_visualize:--enable-visualize} \
+    %{?_with_visualize:--enable-visualize} \
-%ifnarch %{ix86}
+    \
-	--disable-asm \
+    --enable-lavf \
-%endif
+    --disable-ffms \
-	--enable-pthread \
+    --enable-gpac \
-	--enable-debug \
+    --enable-pthread \
-	--enable-shared \
+    --enable-asm \
-	--enable-pic 
+    --enable-debug \
+    --enable-shared \
+    --enable-pic \
+    ;
+
 
 %{__make} %{?_smp_mflags}
 
@@ -108,6 +111,9 @@ iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
 
 
 %changelog
+* Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.0-14.20100625
+- updated source snapshot 20100625
+
 * Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.0-13.20100216
 - change release to sync with self-build-x264