Browse Source

new x264 (ABI 0.136)

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7842 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 8 years ago
parent
commit
1980dffa3a

+ 9 - 4
nonfree/self-build-ffmpeg/ffmpeg-vl.spec

@@ -8,15 +8,17 @@
 
 #% define enable_avconv 1
 
+%global prebuild_doc 1
+
 %global major_version 1.2
 
 Summary:	Digital VCR and streaming server
 Name:		ffmpeg
-Version:	%{major_version}.1
+Version:	%{major_version}.3
 Release:	1%{?svndate:.%svndate}%{?_dist_release}
 Source:		http://ffmpeg.org/releases/%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 ## prebuilt man pages
-Source10:	%{name}-%{?svndate:%svndate}%{!?svndate:%version}-doc.tar.xz
+%{?prebuild_doc:Source10:	%{name}-%{?svndate:%svndate}%{!?svndate:%version}-doc.tar.xz}
 
 %if 0%{?_with_amr:1}
 License:        GPLv3+
@@ -109,7 +111,7 @@ This package contains development files for %{name}.
 %prep
 %setup -q -n %{name}-%{?svndate:%svndate}%{!?svndate:%version}
 
-%__tar -C %{_builddir} -xf %{SOURCE10} || exit 1
+%{?prebuild_doc:%__tar -C %{_builddir} -xf %{SOURCE10} || exit 1}
 
 %build
 %ifarch ppc
@@ -166,7 +168,7 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
     --disable-static \
     --enable-shared \
     --enable-gpl \
-    --disable-doc \
+    %{?prebuild_doc:--disable-doc} \
     --disable-debug \
     --disable-stripping \
     \
@@ -226,6 +228,9 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.3-1
+- new upstream release
+
 * Wed May 22 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.1-1
 - new upstream release
 - added man pages

+ 32 - 1
nonfree/self-build-ffmpeg/self-build-ffmpeg-vl.spec

@@ -4,10 +4,17 @@
     /bin/sed -e 's|posttrans[[:blank:]].*|\#!/bin/bash|' > ${gpac_postinstall_sh} && \
     /bin/bash ${gpac_postinstall_sh} && /bin/rm -f ${gpac_postinstall_sh}
 
+%global x264_postinstall     \
+    x264_postinstall_sh=$(mktemp) && \
+    rpm -q --scripts self-build-x264 | \
+    /bin/sed -e 's|posttrans[[:blank:]].*|\#!/bin/bash|' > ${x264_postinstall_sh} && \
+    /bin/bash ${x264_postinstall_sh} && /bin/rm -f ${x264_postinstall_sh}
+
+
 %global pkgname ffmpeg
 %global name	self-build-%{pkgname}
 %global major_version 1.2
-%global version %{major_version}.1
+%global version %{major_version}.3
 #% define svndate	20110326
 %global release	1%{?svndate:.%svndate}%{?_dist_release}
 
@@ -188,12 +195,36 @@ Rebuild_gpac_ja(){
 Rebuild_gpac_$LOCALE
 %{gpac_postinstall}
 
+## Rebuild x264 with ffmpeg-devel
+# set locale
+case $LANG in
+    ja*)LOCALE=ja ;;
+    *) LOCALE=C ;;
+esac
+
+Rebuild_x264_C(){
+    echo -n "     "
+    echo "Rebuild x264 with ffmpeg-devel"
+}
+
+Rebuild_x264_ja(){
+    echo -n "     "
+    echo "ffmpeg-devel で x264 をリビルドします。"
+}
+
+Rebuild_x264_$LOCALE
+%{x264_postinstall}
+
 
 %files
 %defattr(-,root,root)
 %{_datadir}/%{name}
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.3-1
+- new upstream release
+- added %%{x264_postinstall} in %%post
+
 * Wed May 22 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.1-1
 - new upstream release
 - added man pages

+ 4 - 1
nonfree/self-build-ffmpeg2theora/ffmpeg2theora-vl.spec

@@ -1,7 +1,7 @@
 #% global posttag svn18423
 Name:		ffmpeg2theora
 Version:	0.29
-Release: 	1%{?posttag:.%{posttag}}%{?_dist_release}
+Release: 	2%{?posttag:.%{posttag}}%{?_dist_release}
 Summary:	Convert any file that ffmpeg can decode to theora
 Summary(ja): 	ffmpeg がデコード可能なファイルを theora に変換するツール
 Source0:	http://www.v2v.cc/~j/ffmpeg2theora/downloads/%{name}-%{version}.tar.bz2
@@ -63,6 +63,9 @@ scons install destdir=$RPM_BUILD_ROOT prefix=%{_prefix}
 %{_mandir}/man1/ffmpeg2theora.1.gz
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.29-2
+- rebuilt with ffmpeg-1.2.3
+
 * Mon Feb  4 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.29-1
 - new upstream release
 

+ 5 - 2
nonfree/self-build-ffmpeg2theora/self-build-ffmpeg2theora-vl.spec

@@ -2,7 +2,7 @@
 %define pkgname ffmpeg2theora
 %define name	self-build-%{pkgname}
 %define version	0.29
-%define release	1%{?posttag:.%{posttag}}%{?_dist_release}
+%define release	2%{?posttag:.%{posttag}}%{?_dist_release}
 
 %define sourceurl	http://www.v2v.cc/~j/ffmpeg2theora/downloads/%{pkgname}-%{version}.tar.bz2
 
@@ -24,7 +24,7 @@ Requires(post):		scons
 Requires(post):		libogg-devel >= 1.1
 Requires(post):		libtheora-devel >= 1.1.0
 Requires(post):		libvorbis-devel
-Requires(post):		self-build-ffmpeg >= 0.6.1
+Requires(post):		self-build-ffmpeg >= 1.2
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -116,6 +116,9 @@ ffmpeg2theora は ffmpeg がデコードできるファイルを theora 形式
 %{_datadir}/%{name}
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.29-2
+- rebuilt with ffmpeg-1.2.3
+
 * Mon Feb  4 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.29-1
 - new upstream release
 

+ 29 - 22
nonfree/self-build-gpac/gpac-vl.spec

@@ -1,24 +1,24 @@
-%define svndate  20111217
+#% global svndate  20111217
 
 %define with_static   1
 
 Name:        gpac
 Summary:     MPEG-4 multimedia framework
-Version:     0.4.6
+Version:     0.5.0
 Release:     2%{?svndate:.svn%svndate}%{?_dist_release}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 URL:         http://gpac.sourceforge.net/
-#Source0:     http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
-Source0:     gpac-%{svndate}.tar.bz2
-Source9:     gpac-snapshot-vine.sh
+Source0:     http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
+#Source0:     gpac-%{svndate}.tar.bz2
+#Source9:     gpac-snapshot-vine.sh
 
-Patch1:      gpac-0.4.6_15-soname.patch
+Patch1:      gpac-0.5.0-libdir.patch
 Patch2:      gpac-0.4.6-amr.patch
-Patch5:      gpac-0.4.6-js_cflags.patch
 
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
+Requires: %{name}-libs = %{version}-%{release}
 BuildRequires:  ImageMagick
 BuildRequires:  SDL-devel
 BuildRequires:  librsvg2-devel >= 2.5.0
@@ -97,9 +97,8 @@ Static library for gpac.
 ## remove extra_libs directory
 %__rm -rf extra_libs
 
-%patch1 -p1 -b .soname
+%patch1 -p1 -b .libdir
 %patch2 -p1 -b .amr
-%patch5 -p1 -b .jscflags
 
 ## kwizart - enable dynamic mode - hardcoded with patch2
 # define SONAME number from the first number of gpac version.
@@ -124,6 +123,7 @@ chmod +x configure
 %build
 %configure \
     --X11-path=%{_prefix} \
+    --libdir=%{_lib} \
     %{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
     --enable-pic \
     --disable-static \
@@ -133,7 +133,9 @@ chmod +x configure
     %{?_with_amr:--enable-amr} \
     --use-js=no \
     ;
-    # --use-openjpeg=local \
+
+#Avoid mess with setup.h
+cp -p config.h include/gpac
 
 # Parallele build will fail
 %__make all OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" 
@@ -150,26 +152,25 @@ chmod +x configure
 %__rm -rf $RPM_BUILD_ROOT
 %__make DESTDIR=$RPM_BUILD_ROOT install install-lib
 
-#hack
-%if %{_lib} == "lib64"
-  %__mv $RPM_BUILD_ROOT%{_prefix}/lib $RPM_BUILD_ROOT%{_libdir}
-%endif
-
-## kwizart - rpmlint gpac no-ldconfig-symlink
-#%__ln_s -f libgpac.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
-%__ln_s -f libgpac.so.%{version}-DEV $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
-%__ln_s -f libgpac.so.0 $RPM_BUILD_ROOT%{_libdir}/libgpac.so
-
 #Install generated sggen binaries
-for b in MPEG4 SVG X3D; do
+#MPEG4 SVG X3D
+for b in MPEG4 X3D; do
   pushd applications/generators/${b}
-    %__install -pm 0755 ${b}Gen $RPM_BUILD_ROOT%{_bindir}
+    %__install -pm 0755 ${b}Gen $RPM_BUILD_ROOT%{_bindir} || exit 1
   popd
 done
 
 # #Fix doxygen timestamp
 # touch -r Changelog doc/html/*
 
+#config.h like but not only
+#Usual multilib bug https://bugzilla.rpmfusion.org/show_bug.cgi?id=270
+%__sed -i -e '/GPAC_CONFIGURATION/d' $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h || exit 1
+touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/*.h || exit 1
+touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/internal/*.h || exit 1
+touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/modules/*.h || exit 1
+%__rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h || exit 1
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
@@ -208,6 +209,12 @@ done
 
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.0-2
+- rebuild
+
+* Sat Jan 19 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.0-1
+- new upstream release
+
 * Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.6-2.svn20111217
 - rebuild
 

+ 39 - 36
nonfree/self-build-gpac/self-build-gpac-vl.spec

@@ -1,12 +1,11 @@
-%define svndate  20111217
+#% global svndate  20111217
 
 %define pkgname gpac
 %define name	self-build-%{pkgname}
-%define version 0.4.6
+%define version 0.5.0
 %define release	2%{?svndate:.svn%svndate}%{?_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
+%define sourceurl0	http://prdownloads.sourceforge.net/gpac/%{pkgname}-%{version}.tar.gz
 
 Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
@@ -15,11 +14,10 @@ Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
 
-Source9:     gpac-snapshot-vine.sh
+#Source9:     gpac-snapshot-vine.sh
 
-Source101:      gpac-0.4.6_15-soname.patch
+Source101:      gpac-0.5.0-libdir.patch
 Source102:      gpac-0.4.6-amr.patch
-Source105:      gpac-0.4.6-js_cflags.patch
 
 License:	LGPLv2+
 Group:		Restricted Software
@@ -145,41 +143,40 @@ for MP4 and 3GPP(2) files and many tools for scene descriptions
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE9} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE101} %{SOURCE102} %{SOURCE105} \
+%{__install} -m 644 %{SOURCE101} %{SOURCE102} \
     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-## svn checkout
-# set locale
-case $LANG in
-    ja*)LOCALE=ja ;;
-    *) LOCALE=C ;;
-esac
-
-GetSrc_C(){
-    echo -n "     "
-    echo "Download source file with Subversion..."
-}
-
-GetSrc_ja(){
-    echo -n "     "
-    echo "Subversion を用いてソースファイルをダウンロードしています..."
-}
-
-GetSrc_$LOCALE
-
-# svn checkout
-. /etc/self-build.conf
-(cd $TEMP_DIR
-su $BUILD_USER -c "/bin/bash %{_datadir}/%{name}/%{pkgname}-snapshot-vine.sh >/dev/null 2>&1 || exit 1"
-%__mv %{pkgname}-%{svndate}.tar.bz2 %{_datadir}/%{name}/ || exit 1
-)
-
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec 107000
+# ## svn checkout
+# # set locale
+# case $LANG in
+#     ja*)LOCALE=ja ;;
+#     *) LOCALE=C ;;
+# esac
+
+# GetSrc_C(){
+#     echo -n "     "
+#     echo "Download source file with Subversion..."
+# }
+
+# GetSrc_ja(){
+#     echo -n "     "
+#     echo "Subversion を用いてソースファイルをダウンロードしています..."
+# }
+
+# GetSrc_$LOCALE
+
+# # svn checkout
+# . /etc/self-build.conf
+# (cd $TEMP_DIR
+# su $BUILD_USER -c "/bin/bash %{_datadir}/%{name}/%{pkgname}-snapshot-vine.sh >/dev/null 2>&1 || exit 1"
+# %__mv %{pkgname}-%{svndate}.tar.bz2 %{_datadir}/%{name}/ || exit 1
+# )
+
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec %{sourceurl0} 107000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-libs-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release} \
@@ -191,6 +188,12 @@ su $BUILD_USER -c "/bin/bash %{_datadir}/%{name}/%{pkgname}-snapshot-vine.sh >/d
 %{_datadir}/%{name}
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.0-2
+- rebuild
+
+* Sat Jan 19 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.0-1
+- new upstream release
+
 * Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.6-2.svn20111217
 - rebuild
 

+ 7 - 1
nonfree/self-build-libquicktime/libquicktime-vl.spec

@@ -1,6 +1,6 @@
 Name:            libquicktime
 Version:         1.2.4
-Release:         1%{?_dist_release}
+Release:         3%{?_dist_release}
 License:         LGPLv2+
 Group:           System Environment/Libraries
 Source0:         http://prdownloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
@@ -160,6 +160,12 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec %__rm -f {} \;
 
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.4-3
+- rebuilt with new x264 (ABI 0.136) and ffmpeg (1.2.x)
+
+* Sun Jan 20 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.4-2
+- rebuilt with new x264 (ABI 0.129) and ffmpeg (1.1.x)
+
 * Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.4-1
 - new upstream release
 

+ 9 - 3
nonfree/self-build-libquicktime/self-build-libquicktime-vl.spec

@@ -1,7 +1,7 @@
 %define pkgname libquicktime
 %define name	self-build-%{pkgname}
 %define version 1.2.4
-%define release	1%{?_dist_release}
+%define release	3%{?_dist_release}
 
 %define sourceurl0	http://prdownloads.sourceforge.net/libquicktime/%{pkgname}-%{version}.tar.gz
 
@@ -39,11 +39,11 @@ Requires(post):		libXt-devel
 Requires(post):		libXaw-devel >= 1.0.5
 Requires(post):		libXv-devel
 
-Requires(post):		self-build-ffmpeg
+Requires(post):		self-build-ffmpeg >= 1.2
 Requires(post):		self-build-lame
 Requires(post):		self-build-faad2
 Requires(post):		self-build-faac
-Requires(post):		self-build-x264
+Requires(post):		self-build-x264 >= 0.136
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -147,6 +147,12 @@ libquicktime は quicktime4linux と互換性を持ったソースです。
 %{_datadir}/%{name}
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.4-3
+- rebuilt with new x264 (ABI 0.136) and ffmpeg (1.2.x)
+
+* Sun Jan 20 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.4-2
+- rebuilt with new x264 (ABI 0.129) and ffmpeg (1.1.x)
+
 * Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.4-1
 - new upstream release
 

+ 7 - 1
nonfree/self-build-mjpegtools/mjpegtools-vl.spec

@@ -1,7 +1,7 @@
 # -*- coding: utf-8-unix -*-
 Name:           mjpegtools
 Version:        2.0.0
-Release:        1%{?_dist_release}
+Release:        3%{?_dist_release}
 Summary:        Tools to manipulate MPEG data
 Summary(ja):    MPEG データを操作するツール集
 
@@ -129,6 +129,12 @@ done
 
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.0-3
+- rebuild
+
+* Sun Jan 20 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.0-2
+- rebuild
+
 * Sat Jun 23 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.0-1
 - new upstream release
 

+ 11 - 5
nonfree/self-build-mjpegtools/self-build-mjpegtools-vl.spec

@@ -1,7 +1,7 @@
 %define pkgname mjpegtools
 %define name    self-build-%{pkgname}
 %define version 2.0.0
-%define release 1%{?_dist_release}
+%define release 3%{?_dist_release}
 
 %define sourceurl0	http://prdownloads.sourceforge.net/mjpeg/%{pkgname}-%{version}.tar.gz
 
@@ -29,11 +29,11 @@ Requires(post):  nasm
 Requires(post):  libdv-devel
 Requires(post):  SDL-devel >= 1.1.3
 Requires(post):  SDL_gfx-devel
-Requires(post):  self-build-libquicktime >= 0.9.8
+Requires(post):  self-build-libquicktime >= 1.2.0
 Requires(post):  libpng-devel
 Requires(post):  gtk2-devel >= 2.4.0
-Requires(post):  self-build-mplayer
-Requires(post):  self-build-ffmpeg
+Requires(post):  self-build-mplayer >= 1.1
+Requires(post):  self-build-ffmpeg >= 1.1.0
 #Requires(post):  y4mscaler
 Requires:  which
 Requires(post): /sbin/install-info
@@ -126,7 +126,7 @@ mjpegtools は、Linux 上で
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 194000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 172000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -136,6 +136,12 @@ mjpegtools は、Linux 上で
 
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.0-3
+- rebuild
+
+* Sun Jan 20 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.0-2
+- rebuild
+
 * Sat Jun 23 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.0-1
 - new upstream release
 

+ 14 - 7
nonfree/self-build-mplayer/mplayer-vl.spec

@@ -3,7 +3,7 @@
 %global with_libvpx 1
 
 #% global with_ffmpeg 1
-%global ffmpegver 0.11.1
+%global ffmpegver 0.11.4
 
 #% global svndate  20120525
 #% global dvbappver 0.98
@@ -17,7 +17,7 @@
 Summary:	The Movie Player
 Summary(ja): 	動画プレイヤー
 Name:		mplayer
-Version:	1.1
+Version:	1.1.1
 Release: 	1%{?svndate:.%svndate}%{?_dist_release}
 Source0:	http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}.tar.xz
 #Source0:	mplayer-export-%{svndate}.tar.xz
@@ -37,13 +37,13 @@ Source14:	http://www.mplayerhq.hu/MPlayer/skins/OSX-Mod-1.1.tar.bz2
 # set defaults for Vine Linux
 #Patch2:         %{name}-config.patch
 #Patch2:         %{name}-config-20120525-vine.patch
-Patch2:         %{name}-1.1-config-vine.patch
+Patch2:         %{name}-1.1.1-config-vine.patch
 # use roff include statements instead of symlinks
-Patch8:         %{name}-1.1-manlinks.patch
+Patch8:         %{name}-1.1.1-manlinks.patch
 # erase any trace of libdvdcss
-Patch14:        %{name}-1.1-nodvdcss.patch
+Patch14:        %{name}-1.1.1-nodvdcss.patch
 # use system FFmpeg libraries
-Patch18:        %{name}-1.1-ffmpeg.patch
+Patch18:        %{name}-1.1.1-ffmpeg.patch
 
 ## Vine
 
@@ -101,7 +101,7 @@ BuildRequires:	zlib-devel
 ##BuildRequires:	self-build-libdvdcss
 ##BuildRequires:  self-build-lame
 ##BuildRequires:  self-build-libdca
-##BuildRequires:  self-build-x264 >= 0.0.0-15.20110322
+##BuildRequires:  self-build-x264 >= 0.129
 ##BuildRequires:  self-build-xvidcore >= 0.9.2
 ##BuildRequires:  self-build-faad2 >= 2.6.1
 ##BuildRequires:  self-build-libmpeg2
@@ -320,6 +320,13 @@ fi || :
 
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.1-1
+- updated to 1.1.1
+- build with new x264 (ABI 0.136) and ffmpeg 0.11.4 (libav 0.8.2 as of 2012-09-19)
+
+* Sun Jan 20 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.1-2
+- rebuilt with new x264 (ABI 0.129) and ffmpeg 0.11.2 (libav 0.8.2)
+
 * Wed Jun 13 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.1-1
 - updated to 1.1
   - built with ffmpeg-0.11.1

+ 15 - 8
nonfree/self-build-mplayer/self-build-mplayer-vl.spec

@@ -3,11 +3,11 @@
 %global with_libvpx 1
 
 # define with_ffmpeg 1
-%global ffmpegver 0.11.1
+%global ffmpegver 0.11.4
 
 %global pkgname mplayer
 %global name	self-build-%{pkgname}
-%global version 1.1
+%global version 1.1.1
 #% global svndate  20120525
 %global release	1%{?svndate:.%svndate}%{?_dist_release}
 
@@ -27,10 +27,10 @@ Source12:	http://www.mplayerhq.hu/MPlayer/skins/Blue-small-1.5.tar.bz2
 Source13:	http://www.mplayerhq.hu/MPlayer/skins/standard-1.9.tar.bz2
 Source14:	http://www.mplayerhq.hu/MPlayer/skins/OSX-Mod-1.1.tar.bz2
 
-Source102:        %{pkgname}-1.1-config-vine.patch
-Source108:        %{pkgname}-1.1-manlinks.patch
-Source114:        %{pkgname}-1.1-nodvdcss.patch
-Source118:        %{pkgname}-1.1-ffmpeg.patch
+Source102:        %{pkgname}-1.1.1-config-vine.patch
+Source108:        %{pkgname}-1.1.1-manlinks.patch
+Source114:        %{pkgname}-1.1.1-nodvdcss.patch
+Source118:        %{pkgname}-1.1.1-ffmpeg.patch
 
 License:	GPLv2+
 Group:		Restricted Software
@@ -87,7 +87,7 @@ Requires(post):		self-build-faad2 >= 2.6.1
 Requires(post):		self-build-lame
 Requires(post):		self-build-libdca
 Requires(post):		self-build-libmad
-Requires(post):	self-build-x264 >= 0.120
+Requires(post):	self-build-x264 >= 0.136
 Requires(post):		self-build-xvidcore >= 0.9.2
 Requires(post):		self-build-libmpeg2
 Requires:	TrueType-vlgothic
@@ -212,7 +212,7 @@ samba-libsmbclient-devel: SMB ファイルシステムのサポート
 /usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
     http://www{,1,2,3,4,5,7,8,9}.mplayerhq.hu/%{source0path} \
     %{source1url} \
-    1368000
+    1429000
 exit 0
 
 ## svn checkout
@@ -250,6 +250,13 @@ su $BUILD_USER -c "/bin/bash %{_datadir}/%{name}/%{pkgname}-snapshot-vine.sh >/d
 %{_datadir}/%{name}
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.1-1
+- updated to 1.1.1
+- build with new x264 (ABI 0.136) and ffmpeg 0.11.4 (libav 0.8.2 as of 2012-09-19)
+
+* Sun Jan 20 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.1-2
+- rebuilt with new x264 (ABI 0.129) and ffmpeg 0.11.2 (libav 0.8.2)
+
 * Wed Jun 13 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.1-1
 - updated to 1.1
   - built with ffmpeg-0.11.1

+ 5 - 1
nonfree/self-build-vlc/self-build-vlc-vl.spec

@@ -1,6 +1,6 @@
 %define pkgname vlc
 %define name    self-build-%{pkgname}
-%define version 2.0.7
+%define version 2.1.0
 %define release 1%{?_dist_release}
 
 %define with_mozilla	 		0
@@ -269,6 +269,10 @@ USE_UP0617_ZIP=
 
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.1.0-1
+- new upstream release
+- built with new x264 (ABI 0.136) and ffmpeg (1.2.x)
+
 * Wed Jul  3 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.7-1
 - new upstream release
 

+ 8 - 2
nonfree/self-build-vlc/vlc-vl.spec.in

@@ -1,7 +1,8 @@
 # -*- coding: utf-8-unix -*-
 # TODO: libdc1394(juju), libcaca, modularization (vlc-plugin-foo)
 
-%define use_up0617_zip @@USE_UP0617_ZIP@@
+#% define use_up0617_zip @@USE_UP0617_ZIP@@
+%define use_up0617_zip 0
 
 #% define with_internal_live555 		0
 #% define live555_date	2008.07.25
@@ -16,7 +17,7 @@
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	2.0.7
+Version:	2.1.0
 Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -402,6 +403,11 @@ fi || :
 
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.1.0-1
+- new upstream release
+- built with new x264 (ABI 0.136) and ffmpeg (1.2.x)
+- forcely set use_up0617_zip 0
+
 * Wed Jul  3 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.7-1
 - new upstream release
 

+ 10 - 4
nonfree/self-build-x264/self-build-x264-vl.spec

@@ -1,10 +1,10 @@
-%global snapshot_date	20120525
+%global snapshot_date	20130927
 %global snapshot_time	2245
 %global branch		stable
 
 %global pkgname 	x264
 %global name		self-build-%{pkgname}
-%global version		0.124
+%global version		0.136
 %global release		1.%{snapshot_date}%{?_dist_release}
 
 #define sourceurl0	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/%{pkgname}-snapshot-%{date}-%{time}.tar.bz2
@@ -27,7 +27,7 @@ Requires(post):		self-build-setup >= 0.9.9
 
 # (build)requies of target package.
 Requires(post):	yasm
-Requires(post): self-build-gpac
+Requires(post): self-build-gpac >= 0.5.0
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -106,7 +106,7 @@ x264 はスクラッチから書かれた H264/AVC ビデオストリームを
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 24000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 27000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -115,6 +115,12 @@ x264 はスクラッチから書かれた H264/AVC ビデオストリームを
 %{_datadir}/%{name}
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.136-1.20130927
+- updated source snapshot 20130927 stable branch (ABI 0.136)
+
+* Sat Jan 19 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.129-1.20130118
+- updated source snapshot 20130118 stable branch (ABI 0.129)
+
 * Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.124-1.20120525
 - updated source snapshot 20120525 stable branch (ABI 0.124)
 - changed release number; upstream have release numbers at least on stable branch

+ 8 - 2
nonfree/self-build-x264/x264-vl.spec

@@ -1,10 +1,10 @@
-%global snapshot_date	20120525
+%global snapshot_date	20130927
 %global snapshot_time	2245
 %global branch		stable
 
 Summary: Library for encoding and decoding H264/AVC video streams
 Name: x264
-Version: 0.124
+Version: 0.136
 Release: 1.%{snapshot_date}%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -95,6 +95,12 @@ This package contains the development files.
 
 
 %changelog
+* Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.136-1.20130927
+- updated source snapshot 20130927 stable branch (ABI 0.136)
+
+* Sat Jan 19 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.129-1.20130118
+- updated source snapshot 20130118 stable branch (ABI 0.129)
+
 * Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.124-1.20120525
 - updated source snapshot 20120525 stable branch (ABI 0.124)
 - changed release number; upstream have release numbers at least on stable branch