Browse Source

new upstream release

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

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

@@ -2,23 +2,18 @@
 #TODO: add make test to %%check section
 
 #% define svndate	20100625
-%define with_faac 1
-%define with_vaapi 1
-%define with_libvpx 1
+%global with_faac	1
+%global with_vaapi	1
+%global with_libvpx	1
 
-#% define enable_avconv 1
-
-%global prebuild_doc 1
-
-%global major_version 1.2
+%global major_version	2.5
 
 Summary:	Digital VCR and streaming server
 Name:		ffmpeg
-Version:	%{major_version}.6
-Release:	2%{?svndate:.%svndate}%{?_dist_release}
+Version:	%{major_version}.2
+Release:	1%{?svndate:.%svndate}%{?_dist_release}
 Source:		http://ffmpeg.org/releases/%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 ## prebuilt man pages
-%{?prebuild_doc:Source10:	%{name}-%{?svndate:%svndate}%{!?svndate:%version}-doc.tar.xz}
 
 %if 0%{?_with_amr:1}
 License:        GPLv3+
@@ -112,7 +107,7 @@ This package contains development files for %{name}.
 %prep
 %setup -q -n %{name}-%{?svndate:%svndate}%{!?svndate:%version}
 
-%{?prebuild_doc:%__tar -C %{_builddir} -xf %{SOURCE10} || exit 1}
+%__sed -i "s/-O3 -g/$RPM_OPT_FLAGS/" configure
 
 %build
 %ifarch ppc
@@ -160,6 +155,7 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
     --enable-libvorbis \
     %{?with_libvpx:--enable-libvpx} \
     --enable-libx264 \
+    --enable-libx265 \
     --enable-libxvid \
     \
     --enable-x11grab \
@@ -169,10 +165,10 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
     --disable-static \
     --enable-shared \
     --enable-gpl \
-    %{?prebuild_doc:--disable-doc} \
     --disable-debug \
     --disable-stripping \
     \
+    --disable-doc --disable-htmlpages --disable-podpages --disable-txtpages \
     %{?enable_avconv:--enable-avconv} \
     ;
 
@@ -187,9 +183,9 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 ## install tool/qt-faststart
 %__install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
 
-## install man
-%__mkdir_p $RPM_BUILD_ROOT%{_mandir}/man1/
-%__install -m0644 doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+# ## install man
+# %__mkdir_p $RPM_BUILD_ROOT%{_mandir}/man1/
+# %__install -m0644 doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %clean
@@ -209,26 +205,30 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 %{_bindir}/ffserver
 %{_bindir}/qt-faststart
 %{?enable_avconv:%{_mandir}/man1/avconv.1*}
-%{_mandir}/man1/ffmpeg.1*
-%{_mandir}/man1/ffplay.1*
-%{_mandir}/man1/ffprobe.1*
-%{_mandir}/man1/ffserver.1*
+# %{_mandir}/man1/ffmpeg*.1*
+# %{_mandir}/man1/ffplay*.1*
+# %{_mandir}/man1/ffprobe*.1*
+# %{_mandir}/man1/ffserver*.1*
 %{_datadir}/ffmpeg
 
 
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
+# %{_mandir}/man3/lib*.3.gz
 
 %files devel
 %defattr(-,root,root,-)
-%doc MAINTAINERS doc/APIchanges doc/*.txt
+%doc MAINTAINERS doc/APIchanges doc/*.txt doc/*.html
 %{_includedir}/ffmpeg
 %{_libdir}/pkgconfig/lib*.pc
 %{_libdir}/lib*.so
 
 
 %changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 2.5.2
+- new upstream release
+
 * Sun Jul 13 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.6-2
 - add BuildRequires: libcdio-paranoia-devel
 

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

@@ -13,10 +13,10 @@
 
 %global pkgname ffmpeg
 %global name	self-build-%{pkgname}
-%global major_version 1.2
-%global version %{major_version}.6
+%global major_version 2.5
+%global version %{major_version}.2
 #% define svndate	20110326
-%global release	2%{?svndate:.%svndate}%{?_dist_release}
+%global release	1%{?svndate:.%svndate}%{?_dist_release}
 
 %global sourceurl0	http://ffmpeg.org/releases/%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 
@@ -34,9 +34,6 @@ Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
 #Source1:	%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 
-## prebuilt man pages
-Source10:	%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}-doc.tar.xz
-
 License:	GPLv2+
 Group:		Restricted Software
 
@@ -58,7 +55,7 @@ Requires(post):	libdc1394-devel
 Requires(post):	libogg-devel
 Requires(post):  libass-devel
 %{!?_without_cdio:Requires(post): libcdio-devel}
-%{!?_without_cdio:Requires(post): libcdio-paranoia-devel}
+%{!?_without_cdio:Requires: libcdio-paranoia-devel}
 #libcrystalhd is currently broken
 %{?_with_crystalhd:Requires(post):	libcrystalhd-devel}
 Requires(post):	libraw1394-devel
@@ -85,7 +82,8 @@ Requires(post):		self-build-faac
 Requires(post):		self-build-faad2
 Requires(post):		self-build-lame 
 Requires(post):		self-build-libdca
-Requires(post):		self-build-x264 >= 0.129
+Requires(post):		self-build-x264 >= 0.142
+Requires(post):		self-build-x265 >= 1.4
 Requires(post):		self-build-xvidcore
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -165,7 +163,6 @@ MPEG4, h263, ac3, asf, avi, real, mjpeg, flash を含む
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -222,6 +219,9 @@ Rebuild_x264_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 2.5.2
+- new upstream release
+
 * Sun Jul 13 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.6-2
 - add BuildRequires: libcdio-paranoia-devel
 

+ 15 - 17
nonfree/self-build-gpac/gpac-vl.spec

@@ -5,7 +5,7 @@
 Name:        gpac
 Summary:     MPEG-4 multimedia framework
 Version:     0.5.0
-Release:     4%{?svndate:.svn%svndate}%{?_dist_release}
+Release:     5%{?svndate:.svn%svndate}%{?_dist_release}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 URL:         http://gpac.sourceforge.net/
@@ -125,26 +125,24 @@ chmod +x configure
 
 %build
 %configure \
-    --X11-path=%{_prefix} \
-    --libdir=%{_lib} \
-    %{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
-    --enable-pic \
-    --disable-static \
-    --disable-wx \
-    --extra-cflags="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1" \
+    --extra-cflags="$RPM_OPT_FLAGS -fPIC -DPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1" \
+  --X11-path=%{_prefix} \
+  --libdir=%{_lib} \
     --disable-oss-audio \
+    %{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
     %{?_with_amr:--enable-amr} \
+    --disable-static \
     --use-js=no \
+    \
+    --disable-wx \
     ;
 
 #Avoid mess with setup.h
-cp -p config.h include/gpac
+%__cp -p config.h include/gpac
 
 # Parallele build will fail
-%__make all OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" 
-#{?_smp_mflags}
-%__make sggen OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" 
-#{?_smp_mflags}
+%__make all
+%__make sggen
 
 # ## kwizart - build doxygen doc for devel
 # pushd doc
@@ -153,7 +151,7 @@ cp -p config.h include/gpac
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-%__make DESTDIR=$RPM_BUILD_ROOT install install-lib
+%__make DESTDIR=$RPM_BUILD_ROOT install install-lib INSTFLAGS="-p"
 
 #Install generated sggen binaries
 #MPEG4 SVG X3D
@@ -163,9 +161,6 @@ for b in MPEG4 X3D; do
   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
@@ -212,6 +207,9 @@ touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/modules/*.h || exit 1
 
 
 %changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.0-5
+- rebuilt
+
 * Tue Jun 17 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.5.0-4
 - remove BuildRequires: xmlrpc-epi-devel
 

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

@@ -3,7 +3,7 @@
 %define pkgname gpac
 %define name	self-build-%{pkgname}
 %define version 0.5.0
-%define release	4%{?svndate:.svn%svndate}%{?_dist_release}
+%define release	5%{?svndate:.svn%svndate}%{?_dist_release}
 
 %define sourceurl0	http://prdownloads.sourceforge.net/gpac/%{pkgname}-%{version}.tar.gz
 
@@ -192,6 +192,9 @@ for MP4 and 3GPP(2) files and many tools for scene descriptions
 %{_datadir}/%{name}
 
 %changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.0-5
+- rebuilt
+
 * Tue Jun 17 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.5.0-4
 - remove Requires(post): xmlrpc-epi-devel
 

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

@@ -1,7 +1,7 @@
 ## -*- coding: utf-8-unix -*-
 Summary: 	Library for MPEG TS and DVB PSI tables decoding and generation
 Name: 		libdvbpsi
-Version: 	0.2.2
+Version: 	1.2.0
 Release: 	1%{?_dist_release}
 License: 	LGPLv2+
 Group: 		System Environment/Libraries
@@ -64,6 +64,9 @@ This package contains development files for %{name}
 
 
 %changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.0-1
+- new upstream release
+
 * Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.2.2-1
 - updated to 0.2.2
 - Switch to LGPLv2+

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

@@ -1,6 +1,6 @@
 %define pkgname libdvbpsi
 %define name	self-build-%{pkgname}
-%define version 0.2.2
+%define version 1.2.0
 %define release	1%{?_dist_release}
 
 %define sourceurl0	http://download.videolan.org/pub/libdvbpsi/%{version}/%{pkgname}-%{version}.tar.bz2
@@ -109,6 +109,9 @@ libdvbpsi は MPEG TS と DVB PSI テーブル復号と生成のために設計
 %{_datadir}/%{name}
 
 %changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.0-1
+- new upstream release
+
 * Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.2.2-1
 - updated to 0.2.2
 - Switch to LGPLv2+

+ 23 - 13
nonfree/self-build-mjpegtools/mjpegtools-vl.spec

@@ -1,7 +1,7 @@
 # -*- coding: utf-8-unix -*-
 Name:           mjpegtools
-Version:        2.0.0
-Release:        3%{?_dist_release}
+Version:        2.1.0
+Release:        1%{?_dist_release}
 Summary:        Tools to manipulate MPEG data
 Summary(ja):    MPEG データを操作するツール集
 
@@ -9,12 +9,13 @@ Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://mjpeg.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
-Patch0:         mjpegtools-2.0.0-no-config-in-public-header.h
-Patch1:         mjpegtools_gcc470.patch
+Patch0:         mjpegtools-2.1.0-sdl-cflags.patch
+Patch1:         mjpegtools-2.1.0-no_format.patch
+Patch2:         mjpegtools-2.1.0-pic.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
-Obsoletes:      mjpegtools < %{version}, mjpegtools-devel < %{version}
+Obsoletes: mjpegtools < %{version}-%{release}, mjpegtools-devel < %{version}-%{release}
 
 BuildRequires:  libjpeg-devel
 BuildRequires:  nasm
@@ -61,8 +62,9 @@ for building applications that use mjpegtools libraries.
 
 %prep 
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .sdl
+%patch1 -p1 -b .format
+%patch2 -p0 -b .fpic
 
 %__sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure*
 %__sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths
@@ -109,15 +111,15 @@ done
 %{_infodir}/mjpeg-howto.info*
 ## gui
 %doc README.glav
-#%{_bindir}/glav
+%{_bindir}/glav
 # lavplay and yuvplay won't save -libs/console util users from X11 and SDL
 # dependencies as long as liblavplay is in -libs, but they're inherently
 # GUI tools -> include them here
-#%{_bindir}/lavplay
-#%{_bindir}/y4mhist
-#%{_bindir}/yuvplay
-#%{_mandir}/man1/lavplay.1*
-#%{_mandir}/man1/yuvplay.1*
+%{_bindir}/lavplay
+%{_bindir}/y4mhist
+%{_bindir}/yuvplay
+%{_mandir}/man1/lavplay.1*
+%{_mandir}/man1/yuvplay.1*
 ## libs
 %{_libdir}/lib*.so.*
 
@@ -126,9 +128,17 @@ done
 %{_includedir}/%{name}
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/%{name}.pc
+%{_includedir}/%{name}/*lav*.h
+%{_libdir}/liblav*.so
 
 
 %changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 2.1.0-1
+- new upstream release
+
+* Wed Oct  2 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.0-4
+- added Obsoletes: mjpegtools < %{version}-%{release}, mjpegtools-devel < %{version}-%{release}
+
 * Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.0-3
 - rebuild
 

+ 13 - 6
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 3%{?_dist_release}
+%define version 2.1.0
+%define release 1%{?_dist_release}
 
 %define sourceurl0	http://prdownloads.sourceforge.net/mjpeg/%{pkgname}-%{version}.tar.gz
 
@@ -12,13 +12,14 @@ Version:	%{version}
 Release: 	%{release}
 
 Source0:	%{pkgname}-vl.spec
-Source100:      mjpegtools-2.0.0-no-config-in-public-header.h
-Source101:      mjpegtools_gcc470.patch
+Source100:      mjpegtools-2.1.0-sdl-cflags.patch
+Source101:      mjpegtools-2.1.0-no_format.patch
+Source102:      mjpegtools-2.1.0-pic.patch
 
 License:	GPLv2+
 Group:		Restricted Software
 
-Obsoletes:      mjpegtools < %{version}, mjpegtools-devel < %{version}
+Obsoletes:      mjpegtools < %{version}-%{release}, mjpegtools-devel < %{version}-%{release}
 Obsoletes:      self-build-mjpegtools < %{version}-%{release}
 
 # Requires(posttrans) not yet implemented. So we use (post) instead.
@@ -118,7 +119,7 @@ mjpegtools は、Linux 上で
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE100} %{SOURCE101}  \
+%{__install} -m 644 %{SOURCE100} %{SOURCE101} %{SOURCE102} \
     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 
@@ -136,6 +137,12 @@ mjpegtools は、Linux 上で
 
 
 %changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 2.1.0-1
+- new upstream release
+
+* Wed Oct  2 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.0-4
+- added Obsoletes: mjpegtools < %{version}-%{release}, mjpegtools-devel < %{version}-%{release}
+
 * Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.0-3
 - rebuild
 

+ 6 - 3
nonfree/self-build-mplayer/mplayer-vl.spec

@@ -3,7 +3,7 @@
 %global with_libvpx 1
 
 #% global with_ffmpeg 1
-%global ffmpegver 0.11.4
+%global ffmpegver 0.11.5
 
 #% global svndate  20120525
 
@@ -17,14 +17,14 @@ Summary:	The Movie Player
 Summary(ja): 	動画プレイヤー
 Name:		mplayer
 Version:	1.1.1
-Release: 	2%{?svndate:.%svndate}%{?_dist_release}
+Release: 	3%{?svndate:.%svndate}%{?_dist_release}
 Source0:	http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}.tar.xz
 #Source0:	mplayer-export-%{svndate}.tar.xz
 Source1:	http://ffmpeg.org/releases/ffmpeg-%{ffmpegver}.tar.bz2
 
 Source10:       mplayer-snapshot-vine.sh
 
-Source11:	http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2
+Source11:	http://www.mplayerhq.hu/MPlayer/skins/Blue-1.10.tar.bz2
 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
@@ -310,6 +310,9 @@ fi || :
 
 
 %changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.1-3
+- rebuilt with ffmpeg-0.11.5
+
 * Mon Oct  7 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.1-2
 - remove some obsolete comments
 

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

@@ -3,13 +3,13 @@
 %global with_libvpx 1
 
 # define with_ffmpeg 1
-%global ffmpegver 0.11.4
+%global ffmpegver 0.11.5
 
 %global pkgname mplayer
 %global name	self-build-%{pkgname}
 %global version 1.1.1
 #% global svndate  20120525
-%global release	2%{?svndate:.%svndate}%{?_dist_release}
+%global release	3%{?svndate:.%svndate}%{?_dist_release}
 
 %global source0path	MPlayer/releases/MPlayer-%{version}.tar.xz
 %global source1url	http://ffmpeg.org/releases/ffmpeg-%{ffmpegver}.tar.bz2
@@ -22,7 +22,7 @@ Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
 Source10:	mplayer-snapshot-vine.sh
 
-Source11:	http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2
+Source11:	http://www.mplayerhq.hu/MPlayer/skins/Blue-1.10.tar.bz2
 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
@@ -250,6 +250,9 @@ su $BUILD_USER -c "/bin/bash %{_datadir}/%{name}/%{pkgname}-snapshot-vine.sh >/d
 %{_datadir}/%{name}
 
 %changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.1-3
+- rebuilt with ffmpeg-0.11.5
+
 * Mon Oct  7 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.1-2
 - remove some obsolete comments (mplayer-vl.spec)
 
@@ -347,7 +350,7 @@ su $BUILD_USER -c "/bin/bash %{_datadir}/%{name}/%{pkgname}-snapshot-vine.sh >/d
 - source snapshot 20090905
 - added settings for vl6
 
-* Thu Aug 22 2009 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-23.20090821
+* Sat Aug 22 2009 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-23.20090821
 - source snapshot 20090821
 - replaced BR: libungif-devel with BR: giflib-devel
 - mentioned VDPAU support in %%description

+ 13 - 35
nonfree/self-build-vlc/self-build-vlc-vl.spec

@@ -1,7 +1,9 @@
+%global rcversion 2
+
 %define pkgname vlc
 %define name    self-build-%{pkgname}
-%define version 2.1.2
-%define release 2%{?_dist_release}
+%define version 2.2.0
+%define release 1%{?rcversion:.rc%rcversion}%{?_dist_release}
 
 %define with_mozilla	 		0
 
@@ -9,9 +11,8 @@
 
 %define with_ncurses	 		0
 
-%define sourceurl0	http://download.videolan.org/pub/videolan/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.xz
-%define sourceurl10	http://2sen.dip.jp/cgi-bin/dtvup/source/up0617.zip
-
+#% define sourceurl0	http://download.videolan.org/pub/videolan/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.xz
+%define sourceurl0	http://download.videolan.org/pub/videolan/testing/vlc-2.2.0-rc2/vlc-2.2.0-rc2.tar.xz
 
 Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
@@ -22,11 +23,7 @@ Release: 	%{release}
 Obsoletes:	vlc < %{version}-%{release}, vlc-devel < %{version}-%{release}
 Obsoletes:	self-build-vlc < %{version}-%{release}
 
-#Source0:	%{pkgname}-vl.spec
-Source0:	%{pkgname}-vl.spec.in
-
-Source100:      vlc-2.0.1-fftype.patch
-#Source105:         vlc-1.1.8-bugfix.opencv22.patch
+Source0:	%{pkgname}-vl.spec
 
 License:	GPLv2+
 Group:		Restricted Software
@@ -150,11 +147,11 @@ Requires(post):	self-build-libmpeg2
 Requires(post):	self-build-a52dec
 Requires(post):	self-build-faac
 Requires(post):	self-build-faad2
-Requires(post):	self-build-ffmpeg >= 1.1.0
+Requires(post):	self-build-ffmpeg >= 2.4.0
 Requires(post):	self-build-libdca
-Requires(post):	self-build-libdvbpsi
+Requires(post):	self-build-libdvbpsi >= 1.0.0
 Requires(post):	self-build-libmad
-Requires(post):	self-build-x264 >= 0.129
+Requires(post):	self-build-x264 >= 0.136
 Requires(post):	self-build-xvidcore
 
 BuildArch:	noarch
@@ -232,33 +229,11 @@ mp3, ogg など)だけでなく,DVD や VCD,様々なストリーミング
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE100} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-%postun
-%__rm -f %{_datadir}/%{name}/%{pkgname}-vl.spec
-
 %posttrans
-#set -x
-QUEDIR=/var/cache/self-build
-[ ! -d ${QUEDIR} ] && %__mkdir_p ${QUEDIR}
-
-# copy up0617.zip if you have
-[ ! -f %{_datadir}/%{name}/$(basename %{sourceurl10}) -a \
-  -f ${QUEDIR}/$(basename %{sourceurl10}) ] && \
-  %__cp -fav ${QUEDIR}/$(basename %{sourceurl10}) %{_datadir}/%{name}/
-
-USE_UP0617_ZIP=
-[ -f %{_datadir}/%{name}/$(basename %{sourceurl10}) ] && \
-  USE_UP0617_ZIP=1 || USE_UP0617_ZIP=0
-%__sed -e "s,@@USE_UP0617_ZIP@@,${USE_UP0617_ZIP}," %{_datadir}/%{name}/%{pkgname}-vl.spec.in > %{_datadir}/%{name}/%{pkgname}-vl.spec
-
-## NOTE: stopped 2sen.dip.jp/cgi-bin/dtvup
-# /usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
-#     %{sourceurl0} %{sourceurl10} 1556000
 /usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec %{sourceurl0} 794000
 
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
@@ -270,6 +245,9 @@ USE_UP0617_ZIP=
 
 
 %changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 2.2.0-1.rc2
+- updated to 2.2.0-rc2
+
 * Sun Jul 13 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.2-2
 - remove Requires(post): xosd-devel
 

+ 17 - 28
nonfree/self-build-vlc/vlc-vl.spec.in → nonfree/self-build-vlc/vlc-vl.spec

@@ -1,8 +1,7 @@
 # -*- coding: utf-8-unix -*-
-# TODO: libdc1394(juju), libcaca, modularization (vlc-plugin-foo)
+%global rcversion 2
 
-#% define use_up0617_zip @@USE_UP0617_ZIP@@
-%define use_up0617_zip 0
+# TODO: libdc1394(juju), libcaca, modularization (vlc-plugin-foo)
 
 #% define with_internal_live555 		0
 #% define live555_date	2008.07.25
@@ -17,20 +16,12 @@
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	2.1.2
-Release:	2%{?_dist_release}
+Version:	2.2.0
+Release:	1%{?rcversion:.rc%rcversion}%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org/
-Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.xz
-
-# vlc_patch_0.02/vlc118.diff
-%if %{use_up0617_zip}
-Source10: http://2sen.dip.jp/cgi-bin/dtvup/source/up0617.zip
-%endif
-
-#Patch0:		vlc-2.0.1-fftype.patch
-#Patch5:		vlc-1.1.8-bugfix.opencv22.patch
+Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?rcversion:-rc%rcversion}.tar.xz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -63,9 +54,7 @@ BuildRequires:	fribidi-devel
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:	gnutls-devel >= 1.0.17
 BuildRequires:	gsm-devel
-%if %{?_dist_release} >= "vl7"
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
+#BuildRequires:	jack-audio-connection-kit-devel
 %{?with_dc1394:BuildRequires:  libavc1394-devel >= 0.5.3}
 %{?with_dc1394:BuildRequires:  libraw1394-devel >= 2.0.1}
 BuildRequires:	libass-devel >= 0.9.7
@@ -225,14 +214,7 @@ IPv4 or IPv6 on a high-bandwidth network.
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
-
-#%patch0 -p1
-
-%if %{use_up0617_zip}
-unzip %{SOURCE10}
-patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
-%endif
+%setup -q -n %{name}-%{version}%{?rcversion:-rc%rcversion}
 
 %__rm aclocal.m4 m4/lib*.m4 m4/lt*.m4
 ./bootstrap
@@ -285,13 +267,13 @@ patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
 	--enable-directfb			\
 	--enable-aa				\
 	%{?_with_caca:--enable-caca}	\
-%if %{?_dist_release} >= "vl7"
-	--enable-jack				\
-%endif
+	--disable-jack				\
     %{?_with_portaudio:--enable-portaudio} \
 	--enable-pulse				\
 %if %with_ncurses
 	--enable-ncurses			\
+%else
+	--disable-ncurses			\
 %endif
 	--disable-xosd				\
 	--enable-fbosd				\
@@ -305,6 +287,7 @@ patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
 %if %with_mozilla 
 	--enable-mozilla			\
 %endif
+	--disable-shine			\
 	;
 
 %__make %{?_smp_mflags}
@@ -408,6 +391,12 @@ fi || :
 
 
 %changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 2.2.0-1.rc2
+- updated to 2.2.0-rc2
+
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 2.1.5-1
+- new upstream release
+
 * Sun Jul 13 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.2-2
 - remove BuildRequires: xosd-devel
 

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

@@ -1,14 +1,14 @@
-%global snapshot_date	20130927
+%global snapshot_date	20141218
 %global snapshot_time	2245
 %global branch		stable
 
 %global pkgname 	x264
 %global name		self-build-%{pkgname}
-%global version		0.136
+%global version		0.142
 %global release		1.%{snapshot_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-%{snapshot_date}-%{snapshot_time}%{?branch:-%{branch}}.tar.bz2
+%define sourceurl0	http://download.videolan.org/pub/x264/snapshots/%{pkgname}-snapshot-%{snapshot_date}-%{snapshot_time}%{?branch:-%{branch}}.tar.bz2
 
 Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
@@ -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}" 27000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 24000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -115,6 +115,9 @@ x264 はスクラッチから書かれた H264/AVC ビデオストリームを
 %{_datadir}/%{name}
 
 %changelog
+* Fri Dec 26 2014 Munehiro Yamamoto <munepi@vinelinux.org> 0.142-1.20141218
+- updated source snapshot 20141218 stable branch (ABI 0.142)
+
 * Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.136-1.20130927
 - updated source snapshot 20130927 stable branch (ABI 0.136)
 

+ 6 - 3
nonfree/self-build-x264/x264-vl.spec

@@ -1,15 +1,15 @@
-%global snapshot_date	20130927
+%global snapshot_date	20141218
 %global snapshot_time	2245
 %global branch		stable
 
 Summary: Library for encoding and decoding H264/AVC video streams
 Name: x264
-Version: 0.136
+Version: 0.142
 Release: 1.%{snapshot_date}%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.videolan.org/developers/x264.html
-Source: http://www.videolan.org/pub/videolan/x264/snapshots/%{name}-snapshot-%{snapshot_date}-%{snapshot_time}%{?branch:-%{branch}}.tar.bz2
+Source: http://download.videolan.org/pub/x264/snapshots/%{name}-snapshot-%{snapshot_date}-%{snapshot_time}%{?branch:-%{branch}}.tar.bz2
 BuildRequires: yasm >= 1.0.0
 # gpac-devel package provided by self-build-gpac
 # in self-build-%{name}.spec as PreReq.
@@ -95,6 +95,9 @@ This package contains the development files.
 
 
 %changelog
+* Fri Dec 26 2014 Munehiro Yamamoto <munepi@vinelinux.org> 0.142-1.20141218
+- updated source snapshot 20141218 stable branch (ABI 0.142)
+
 * Sun Sep 29 2013 Munehiro Yamamoto <munepi@vinelinux.org> 0.136-1.20130927
 - updated source snapshot 20130927 stable branch (ABI 0.136)
 

+ 123 - 0
nonfree/self-build-x265/self-build-x265-vl.spec

@@ -0,0 +1,123 @@
+%global commit 5e604833c5aa
+
+%global pkgname 	x265
+%global name		self-build-%{pkgname}
+%global version		1.4
+%global release		1%{?_dist_release}
+
+%global sourceurl0	https://bitbucket.org/multicoreware/x265/get/%{version}.tar.bz2
+
+Summary:	Package to automatically build %{pkgname} rpm package
+Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
+Name:		%{name}
+Version:	%{version}
+Release: 	%{release}
+Source0:	%{pkgname}-vl.spec
+
+Source100: x265-pc-path.patch
+Source101: x265-test-shared.patch
+Source102: x265-pic.patch
+
+License:	GPLv2+ and BSD
+Group:		Restricted Software
+
+Obsoletes:      x265 < %{version}, x265-devel < %{version}
+Obsoletes:      self-build-x265 < %{version}-%{release}
+
+Requires(post):		self-build-setup >= 0.9.9
+
+# (build)requies of target package.
+Requires(post): cmake
+Requires(post): yasm
+
+BuildArch:	noarch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+
+Packager:	munepi
+
+%description
+The primary objective of x265 is to become the best H.265/HEVC encoder
+available anywhere, offering the highest compression efficiency and the
+highest performance on a wide variety of hardware platforms.
+
+If you install this package, it automaticaly downloads source
+code ,compile it, and create rpm packages of %{pkgname}-%{version}.
+And the created rpm packages are automatically installed
+if installation is executed by apt-get command or synaptic
+package manager.
+
+[Note]
+This package requires many other packages to compile
+targetsoftware. So it consume more disk space than usual.
+Also installation takes logner time because of compilation.
+(This will take a few minutes to quarter or half of an hour,
+depends on building environment)
+
+[About self-build package]
+For some kind of software, distributing of binary package
+may viorate the patent or law. Therefore we chose self-build
+packge, create binary package on your machine, for such kind
+of softwares instead of distributing binary package.
+
+Please obey the national law when you use the created binary
+packages. And if you want to use the softwares using patented 
+thechnology, it may be required to get a permission, make an 
+agreement or purchas a license. Please consider it with your
+purpose or way of use and take appropriate action.
+
+%description -l ja
+x265はH.265/HEVCをエンコードするためのライブラリです。
+
+このパッケージをインストールすると、自動的にソースコードを
+ダウンロードしてコンパイルし、%{pkgname}-%{version} の rpm
+パッケージを作成します。
+また apt-get コマンドや synaptic パッケージマネージャから実行
+した場合は、作成された rpm パッケージのインストールも自動的に
+行います。
+
+[注意]
+コンパイルに必要な多くの関連パッケージを要求するので通常より
+ディスクの領域を多く消費します。
+またインストール時にコンパイルを行うため、通常より時間がかか
+る場合があります。(環境にもよりますが数分から数十分程度)
+
+[self-build パッケージについて]
+ソフトウェアによってはバイナリパッケージの配布が特許や法律に
+違反する可能性があるものがあります。その為、このような問題が
+懸念されるソフトウェアについてはバイナリパッケージを直接配布
+せずに、ユーザの環境でバイナリを作成する self-build パッケー
+ジという方法を採っています。
+
+作成されたバイナリパッケージの利用にあたっては、各ソフトウェ
+アのライセンス、および利用する国の各種法令に従ってください。
+また特許に関連するソフトウェアの場合、利用許諾や契約、ライ
+センスの購入などが必要となる場合がありますので、利用する目的
+や形態に応じて各自で判断し適切な対応を取ってください。
+
+%prep
+[ "%{version}-%{release}" != $(rpm -q --queryformat "%%{version}-%%{release}\n" --specfile %{SOURCE0} | tail -1) ] && exit 1
+
+
+%install
+%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+%{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+%{__install} -m 644 %{SOURCE100} %{SOURCE101} %{SOURCE102} \
+	     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+
+%clean
+%{__rm} -rf ${RPM_BUILD_ROOT}
+
+%posttrans
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 24000
+/usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
+                                 %{pkgname}-devel-%{version}-%{release}
+
+%files
+%defattr(-,root,root)
+%{_datadir}/%{name}
+
+%changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.4-1
+- new upstream release
+- initial build based on RPM Fusion rawhide

+ 116 - 0
nonfree/self-build-x265/x265-vl.spec

@@ -0,0 +1,116 @@
+%global commit 5e604833c5aa
+
+Summary: H.265/HEVC encoder library
+Name: x265
+Version: 1.4
+Release: 1%{?_dist_release}
+URL: http://x265.org/
+Source0: https://bitbucket.org/multicoreware/x265/get/%{version}.tar.bz2
+# fix pkgconfig file installation path
+Patch0: x265-pc-path.patch
+# link test binaries with shared library
+Patch1: x265-test-shared.patch
+# build with -fPIC on arm and i686, too
+Patch2: x265-pic.patch
+# source/Lib/TLibCommon - BSD
+# source/Lib/TLibEncoder - BSD
+# everything else - GPLv2+
+License: GPLv2+ and BSD
+BuildRequires: cmake
+BuildRequires: yasm
+
+%description
+The primary objective of x265 is to become the best H.265/HEVC encoder
+available anywhere, offering the highest compression efficiency and the
+highest performance on a wide variety of hardware platforms.
+
+This package contains the command line encoder and the shared library.
+
+%package devel
+Summary: H.265/HEVC encoder library development files
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+The primary objective of x265 is to become the best H.265/HEVC encoder
+available anywhere, offering the highest compression efficiency and the
+highest performance on a wide variety of hardware platforms.
+
+This package contains the shared library development files.
+
+%prep
+%setup -q -n multicoreware-%{name}-%{commit}
+%patch0 -p1 -b .p
+# tests are crashing on x86 if linked against shared libx265
+%ifnarch i686
+%patch1 -p1 -b .ts
+%endif
+%patch2 -p1 -b .pic
+
+# f=doc/uncrustify/drag-uncrustify.bat
+# tr -d '\r' < ${f} > ${f}.unix && \
+# touch -r ${f} ${f}.unix && \
+# %__mv ${f}.unix ${f} || exit 1
+
+%build
+%cmake -G "Unix Makefiles" \
+ -DCMAKE_SKIP_RPATH:BOOL=YES \
+ -DENABLE_TESTS:BOOL=ON \
+ source
+%__make %{?_smp_mflags}
+
+%install
+%__make DESTDIR=%{buildroot} install
+%__rm %{buildroot}%{_libdir}/libx265.a || exit 1
+# %__install -Dpm644 COPYING %{buildroot}%{_pkgdocdir}/COPYING
+
+%check
+LD_LIBRARY_PATH=$(pwd) test/PoolTest
+LD_LIBRARY_PATH=$(pwd) test/TestBench
+
+exit 0
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%{_bindir}/x265
+# %dir %{_pkgdocdir}
+# %{_pkgdocdir}/COPYING
+%doc COPYING
+%{_libdir}/libx265.so.35
+
+%files devel
+%doc doc/*
+%{_includedir}/x265.h
+%{_includedir}/x265_config.h
+%{_libdir}/libx265.so
+%{_libdir}/pkgconfig/x265.pc
+
+%changelog
+* Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.4-1
+- new upstream release
+- initial build based on RPM Fusion rawhide
+
+* Sun Aug 17 2014 Dominik Mierzejewski <rpm@greysector.net> 1.2-5
+- don't include contributor agreement in doc
+- make sure /usr/share/doc/x265 is owned
+- add a comment noting which files are BSD-licenced
+
+* Fri Aug 08 2014 Dominik Mierzejewski <rpm@greysector.net> 1.2-4
+- don't create bogus soname (patch by Xavier)
+
+* Thu Jul 17 2014 Dominik Mierzejewski <rpm@greysector.net> 1.2-3
+- fix tr call to remove DOS EOL
+- build the library with -fPIC on arm and i686, too
+
+* Sun Jul 13 2014 Dominik Mierzejewski <rpm@greysector.net> 1.2-2
+- use version in source URL
+- update License tag
+- fix EOL in drag-uncrustify.bat
+- don't link test binaries with shared binary on x86 (segfault)
+
+* Thu Jul 10 2014 Dominik Mierzejewski <rpm@greysector.net> 1.2-1
+- initial build
+- fix pkgconfig file install location
+- link test binaries with shared library