Browse Source

updated self-build-ffmpeg-vl.spec, self-build-gpac-vl.spec self-build-libquicktime-vl.spec self-build-mplayer-vl.spec self-build-vlc-vl.spec self-build-x264-vl.spec; added rtmpdump-vl.spec

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

+ 39 - 12
nonfree/self-build-ffmpeg/ffmpeg-vl.spec

@@ -5,13 +5,15 @@
 ## available for v0.6 or lower
 %define with_libfaad 1
 
+%define with_faac 1
+
 %define with_vaapi 1
 %define with_libvpx 1
 
 Summary:	Digital VCR and streaming server
 Name:		ffmpeg
 Version:	0.6.1
-Release:	1%{?svndate:.%svndate}%{?_dist_release}
+Release:	2%{?svndate:.%svndate}%{?_dist_release}
 Source:		http://ffmpeg.org/releases/%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 Source1:        %{name}-snapshot.sh
 
@@ -31,13 +33,15 @@ BuildRequires:	gsm-devel
 BuildRequires:	imlib2-devel
 BuildRequires:	libdc1394-devel
 BuildRequires:	libraw1394-devel
+BuildRequires:	librtmp-devel >= 2.3
 BuildRequires:	libtheora-devel
-%{?with_vaapi:BuildRequires:libva-devel}
-%{?with_libvpx:BuildRequires:  libvpx-devel >= 0.9.1}
+%{?with_vaapi:BuildRequires:libva-devel >= 0.31.0}
 BuildRequires:  libvdpau-devel
 BuildRequires:	libvorbis-devel
+%{?with_libvpx:BuildRequires:  libvpx-devel >= 0.9.1}
 %{?_with_opencore_amr:BuildRequires: opencore-amr-devel}
 ##BuildRequires:  openjpeg-devel
+##BuildRequires:  schroedinger-devel
 BuildRequires:	SDL-devel
 BuildRequires:  speex-devel
 ##BuildRequires:	texi2html
@@ -48,9 +52,13 @@ BuildRequires:	yasm
 %endif
 # *-devel packages provided by other self-build-* should only be listed
 # in self-build-%{name}.spec as PreReq.
-#BuildRequires: xvidcore-devel, faac-devel, lame-devel
-#BuildRequires: x264-devel, libdca-devel, a52dec-devel
+#BuildRequires: a52dec-devel
+#BuildRequires: faac-devel
+#BuildRequires: lame-devel
+#BuildRequires: libdca-devel
 #BuildRequires: faad2-devel
+#BuildRequires: x264-devel >= 0.0.0-15.20110322
+#BuildRequires: xvidcore-devel
 
 Requires:	%{name}-libs = %{version}-%{release}
 
@@ -112,36 +120,39 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 %endif
 %ifarch ppc
     --cpu=g3 \
+    --enable-pic \
 %endif
     --enable-runtime-cpudetect \
     --extra-cflags="$RPM_OPT_FLAGS" \
     %{?_with_opencore_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3} \
     --enable-bzlib \
+    --enable-zlib \
     --enable-libdc1394 \
-    --enable-libfaac --enable-nonfree \
+    %{?_with_libdirac:--enable-libdirac} \
+    %{?with_faac:--enable-libfaac --enable-nonfree} \
     %{?with_libfaad:--enable-libfaad} \
     --enable-libgsm \
     --enable-libmp3lame \
     %{?_with_openjpeg:--enable-libopenjpeg} \
+    --enable-librtmp \
+    --enable-libspeex \
     --enable-libtheora \
     --enable-libvorbis \
     %{?with_libvpx:--enable-libvpx} \
     --enable-libx264 \
     --enable-libxvid \
-    --enable-zlib \
     \
     --enable-x11grab \
     --enable-avfilter \
-    --enable-avfilter-lavf \
     --enable-postproc \
-    --enable-swscale \
     --enable-pthreads \
     --disable-static \
     --enable-shared \
     --enable-gpl \
     --disable-doc \
     --disable-debug \
-    --disable-stripping
+    --disable-stripping \
+    ;
 
 %{__make} %{?_smp_mflags}
 #% {__make}
@@ -151,6 +162,9 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 %install
 %__make install DESTDIR=$RPM_BUILD_ROOT
 
+# ## install tool/qt-faststart
+# %__install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
+
 ## install man
 %__mkdir_p $RPM_BUILD_ROOT%{_mandir}/man1/
 %__install %{SOURCE90} %{SOURCE91} %{SOURCE92} %{SOURCE93} \
@@ -167,8 +181,15 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 %files
 %defattr(-,root,root,-)
 %doc COPYING.* CREDITS Changelog README doc/ffserver.conf
-%{_bindir}/ff*
-%{_mandir}/man1/ff*.1*
+%{_bindir}/ffmpeg
+%{_bindir}/ffplay
+%{_bindir}/ffprobe
+%{_bindir}/ffserver
+#%{_bindir}/qt-faststart
+%{_mandir}/man1/ffmpeg.1*
+%{_mandir}/man1/ffplay.1*
+%{_mandir}/man1/ffprobe.1*
+%{_mandir}/man1/ffserver.1*
 %{_datadir}/ffmpeg
 
 
@@ -185,6 +206,12 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 
 %changelog
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.6.1-2
+- required latest x264 build
+- added BuildRequires: librtmp-devel >= 2.3
+- build PIC objects on PPC
+#- add qt-faststart tool
+
 * Sat Oct 30 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.6.1-1
 - new upstream release
 

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

@@ -7,14 +7,16 @@
 %define pkgname ffmpeg
 %define name	self-build-%{pkgname}
 %define version 0.6.1
-#% define svndate	20100625
-%define release	1%{?svndate:.%svndate}%{?_dist_release}
+#% define svndate	20110326
+%define release	2%{?svndate:.%svndate}%{?_dist_release}
 
 %define sourceurl0	http://ffmpeg.org/releases/%{pkgname}-%{version}.tar.bz2
 
 ## available for v0.6 or lower
 %define with_libfaad 1
 
+%define with_faac 1
+
 %define with_vaapi 1
 %define with_libvpx 1
 
@@ -43,13 +45,15 @@ Requires(post):	gsm-devel
 Requires(post):	imlib2-devel
 Requires(post):	libdc1394-devel
 Requires(post):	libraw1394-devel
+Requires(post):	librtmp-devel >= 2.3
 Requires(post):	libtheora-devel
+%{?with_vaapi:Requires(post):	libva-devel >= 0.31.0}
 Requires(post):  libvdpau-devel
-%{?with_vaapi:Requires(post):  libva-devel}
-%{?with_libvpx:Requires(post):  libvpx-devel >= 0.9.1}
 Requires(post):	libvorbis-devel
-#%{?_with_opencore_amr:Requires(post):  opencore-amr-devel}
+%{?with_libvpx:Requires(post):  libvpx-devel >= 0.9.1}
+%{?_with_opencore_amr:Requires(post):  opencore-amr-devel}
 ##Requires(post):  openjpeg-devel
+##Requires(post):  schroedinger-devel
 Requires(post):	SDL-devel
 Requires(post):  speex-devel
 ##Requires(post):	texi2html
@@ -58,13 +62,13 @@ Requires(post):	libogg-devel
 %ifarch %{ix86} x86_64
 Requires(post):		yasm
 %endif
-Requires(post):		self-build-xvidcore
+Requires(post):		self-build-a52dec
 Requires(post):		self-build-faac
+Requires(post):		self-build-faad2
 Requires(post):		self-build-lame 
-Requires(post):		self-build-x264
 Requires(post):		self-build-libdca
-Requires(post):		self-build-a52dec
-Requires(post):		self-build-faad2
+Requires(post):		self-build-x264 >= 0.0.0-15.20110322
+Requires(post):		self-build-xvidcore
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -183,6 +187,10 @@ Rebuild_gpac_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.6.1-2
+- required latest x264 build
+- added BuildRequires: librtmp-devel >= 2.3
+
 * Sat Oct 30 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.6.1-1
 - new upstream release
 

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

@@ -3,7 +3,7 @@
 Name:        gpac
 Summary:     MPEG-4 multimedia framework
 Version:     0.4.5
-Release:     9%{?_dist_release}
+Release:     10%{?_dist_release}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 URL:         http://gpac.sourceforge.net/
@@ -218,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.5-10
+- rebuild
+
 * Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.5-9
 - removed doxygen support
 

+ 4 - 1
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	9%{?_dist_release}
+%define release	10%{?_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
@@ -166,6 +166,9 @@ for MP4 and 3GPP(2) files and many tools for scene descriptions
 %{_datadir}/%{name}
 
 %changelog
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.5-10
+- rebuild
+
 * Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.5-9
 - dropped Requires(post):  doxygen
 

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

@@ -1,6 +1,6 @@
 Name:            libquicktime
 Version:         1.2.2
-Release:         1%{?_dist_release}
+Release:         2%{?_dist_release}
 License:         LGPLv2+
 Group:           System Environment/Libraries
 Source0:         http://prdownloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
@@ -165,6 +165,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec %__rm -f {} \;
 
 
 %changelog
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.2-2
+- rebuilt
+
 * Mon Jan 31 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.2-1
 - new upstream release
 - added the subpackage utils

+ 4 - 1
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.2
-%define release	1%{?_dist_release}
+%define release	2%{?_dist_release}
 
 %define sourceurl0	http://prdownloads.sourceforge.net/libquicktime/%{pkgname}-%{version}.tar.gz
 
@@ -147,6 +147,9 @@ libquicktime は quicktime4linux と互換性を持ったソースです。
 %{_datadir}/%{name}
 
 %changelog
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.2-2
+- rebuilt
+
 * Mon Jan 31 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.2-1
 - new upstream release
 - added the subpackage utils

+ 28 - 10
nonfree/self-build-mplayer/mplayer-vl.spec

@@ -3,10 +3,10 @@
 
 %define name	mplayer
 %define version	1.0
-%define extver	rc3
-#% define release	4%{?extver:.%{extver}}%{?_dist_release}
+%define extver	rc4
+%define release	41%{?extver:.%{extver}}%{?_dist_release}
 %define svndate  20100709
-%define release	40.%{svndate}%{?_dist_release}
+#% define release	40.%{svndate}%{?_dist_release}
 
 %define ttfontdir   /usr/share/fonts
 %define ttfontlist  TrueType-vlgothic/VL-PGothic-Regular \\\
@@ -17,8 +17,8 @@ Summary(ja): 	動画プレイヤー
 Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
-#Source0:	http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{extver}.tar.bz2
-Source0:	mplayer-export-%{svndate}.tar.bz2
+Source0:	http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{extver}.tar.bz2
+#Source0:	mplayer-export-%{svndate}.tar.bz2
 Source1:	http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
 Source10:       mplayer-snapshot-vine.sh
 #Patch2:         %{name}-config.patch
@@ -40,7 +40,7 @@ BuildRequires:	cdparanoia-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:	esound-devel
 BuildRequires:  enca-devel
-BuildRequires:	freetype2-devel
+BuildRequires:	freetype2-devel >= 2.0.9
 BuildRequires:  fribidi-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:	giflib-devel
@@ -52,14 +52,21 @@ BuildRequires:  libXv-devel
 BuildRequires:  libXvMC-devel
 BuildRequires:  libXxf86dga-devel
 BuildRequires:  libXxf86vm-devel
+BuildRequires:  libass-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libdvdread
-BuildRequires:  libmpcdec-devel
+BuildRequires:  libmpcdec-devel >= 1.2.1
+BuildRequires:  librtmp-devel >= 2.3
+BuildRequires:  speex-devel >= 1.1
+%if %{?_dist_release} != "vl5"
 %{?with_vaapi:BuildRequires:libva-devel}
+%endif
 BuildRequires:  libvdpau-devel
 BuildRequires:	libvorbis-devel
+%if %{?_dist_release} != "vl5"
 %{?with_libvpx:BuildRequires:  libvpx-devel >= 0.9.1}
+%endif
 BuildRequires:  lzo-devel >= 2
 BuildRequires:  pulseaudio-lib-devel
 BuildRequires:  speex-devel >= 1.1
@@ -76,7 +83,7 @@ BuildRequires:	zlib-devel
 ##BuildRequires:  self-build-faac
 ##BuildRequires:  self-build-lame
 ##BuildRequires:  self-build-libdca
-##BuildRequires:  self-build-x264 >= 0.0.0-4.20090110
+##BuildRequires:  self-build-x264 >= 0.0.0-15.20110322
 ##BuildRequires:  self-build-xvidcore >= 0.9.2
 ##BuildRequires:  self-build-faad2 >= 2.6
 ##BuildRequires:  self-build-libmad
@@ -125,8 +132,8 @@ MPlayer は何もしなくても DVD や MPEG-1/2/4 のように一般的なフ
 
 
 %prep
-#% setup -q -n MPlayer-%{version}%{extver}
-%setup -q -n mplayer-export-%{svndate}
+%setup -q -n MPlayer-%{version}%{extver}
+#%setup -q -n mplayer-export-%{svndate}
 
 %patch2 -p1 -b .config
 %patch8 -p1 -b .manlinks
@@ -153,6 +160,8 @@ MPlayer は何もしなくても DVD や MPEG-1/2/4 のように一般的なフ
     \
     --disable-libopenjpeg \
     \
+    --enable-vdpau \
+    \
     --disable-bitmap-font \
     --disable-termcap \
     --enable-xvmc \
@@ -253,6 +262,15 @@ done
 
 
 %changelog
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-41.rc4
+- new upstream release
+  - ready for Vine Linux 6
+  - revived support for Vine Linux 5
+- added BuildRequires: 
+  - libass-devel
+  - librtmp-devel >= 2.3
+  - speex-devel >= 1.1
+
 * Tue Feb 01 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-40.20100709
 - added BuildRequires:
   - aalib-devel

+ 33 - 6
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	rc3
-#% define release	4%{?extver:.%{extver}}%{?_dist_release}
+%define extver	rc4
+%define release	41%{?extver:.%{extver}}%{?_dist_release}
 %define svndate  20100709
-%define release	40.%{svndate}%{?_dist_release}
+#% define release	40.%{svndate}%{?_dist_release}
 
 %define source0path	MPlayer/releases/MPlayer-%{version}%{extver}.tar.bz2
 %define source1path	MPlayer/skins/Blue-1.7.tar.bz2
@@ -44,7 +44,7 @@ Requires(post):	cdparanoia-devel
 Requires(post):  desktop-file-utils
 Requires(post):	esound-devel
 Requires(post):  enca-devel
-Requires(post):	freetype2-devel
+Requires(post):	freetype2-devel >= 2.0.9
 Requires(post):  fribidi-devel
 Requires(post):  fontconfig-devel
 Requires(post):	giflib-devel
@@ -56,14 +56,21 @@ Requires(post):  libXv-devel
 Requires(post):  libXvMC-devel
 Requires(post):  libXxf86dga-devel
 Requires(post):  libXxf86vm-devel
+Requires(post):  libass-devel
 Requires(post):	libpng-devel
 Requires(post):	libjpeg-devel
 Requires(post):	libdvdread
-Requires(post):  libmpcdec-devel
+Requires(post):  libmpcdec-devel >= 1.2.1
+Requires(post):  librtmp-devel >= 2.3
+Requires(post):  speex-devel >= 1.1
+%if %{?_dist_release} != "vl5"
 %{?with_vaapi:Requires(post):libva-devel}
+%endif
 Requires(post):  libvdpau-devel
 Requires(post):	libvorbis-devel
+%if %{?_dist_release} != "vl5"
 %{?with_libvpx:Requires(post):  libvpx-devel >= 0.9.1}
+%endif
 Requires(post):  lzo-devel >= 2
 Requires(post):  pulseaudio-lib-devel
 Requires(post):  speex-devel >= 1.1
@@ -80,7 +87,11 @@ Requires(post):		self-build-faad2 >= 2.6
 Requires(post):		self-build-lame
 Requires(post):		self-build-libdca
 Requires(post):		self-build-libmad
-Requires(post):		self-build-x264 >= 0.0.0-9.20090522
+%if %{?_dist_release} != "vl5"
+Requires(post):	self-build-x264 >= 0.0.0-15.20110322
+%elseif %{?_dist_release} == "vl5"
+Requires(post):	self-build-x264 >= 0.0.0-9.20090522
+%endif
 Requires(post):		self-build-xvidcore >= 0.9.2
 Requires(post):		self-build-libmpeg2
 Requires:	TrueType-vlgothic
@@ -201,6 +212,13 @@ samba-libsmbclient-devel: SMB ファイルシステムのサポート
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
+## official tarball
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
+    http://www{,1,2,3,4,5,7,8}.mplayerhq.hu/%{source0path} \
+    http://www{,1,2,3,4,5,7,8}.mplayerhq.hu/%{source1path} \
+    635000
+exit 0
+
 ## svn checkout
 # set locale
 case $LANG in
@@ -240,6 +258,15 @@ su $BUILD_USER -c "/bin/bash %{_datadir}/%{name}/%{pkgname}-snapshot-vine.sh >/d
 %{_datadir}/%{name}
 
 %changelog
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-41.rc4
+- new upstream release
+  - ready for Vine Linux 6
+  - revived support for Vine Linux 5
+- added Requires(post): 
+  - libass-devel
+  - librtmp-devel >= 2.3
+  - speex-devel >= 1.1
+
 * Tue Feb 01 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-40.20100709
 - added BuildRequires:
   - aalib-devel

+ 58 - 11
nonfree/self-build-vlc/self-build-vlc-vl.spec

@@ -1,6 +1,6 @@
 %define pkgname vlc
 %define name    self-build-%{pkgname}
-%define version 1.1.7
+%define version 1.1.8
 %define release 1%{?_dist_release}
 
 %define with_mozilla	 		0
@@ -24,11 +24,8 @@ Obsoletes:	vlc-devel < 1.1.0
 Source0:	%{pkgname}-vl.spec
 
 Source100:      vlc-1.1.0-vlc-cache-gen_noerror.patch
-#Source101:	0001-Libnotify-depends-on-a-gtk.patch
 Source103:	vlc-1.1.6-hardode_font_patch.patch
 Source104:	vlc-1.1.4-tls_path.patch
-#Source105:	vlc-backport-lirc_fix.patch
-#Source106:	vlc-backport-signal_fix.patch
 
 ## vine
 Source150:	vlc-1.1.7-revert-pulse-c.patch
@@ -48,10 +45,10 @@ Requires(post):	avahi-devel
 Requires(post):  cdparanoia-devel
 Requires(post):  dbus-devel
 %{?_with_dirac: Requires(post): dirac-devel >= 1.0.0}
-%if %with_directfb
+#Requires(post):  directfb-devel
 Requires(post):  libdirectfb-devel
-%endif
 Requires(post):	flac-devel
+##!! Requires(post):  fluidsynth-devel
 Requires(post):	fribidi-devel
 Requires(post):  gnome-vfs2-devel
 Requires(post):	gnutls-devel >= 1.0.17
@@ -59,22 +56,38 @@ Requires(post):	gsm-devel
 Requires(post):	hal-devel
 Requires(post):	jack-audio-connection-kit-devel
 Requires(post):  libavc1394-devel
-Requires(post):  libass-devel >= 0.9.7
+Requires(post):	libass-devel >= 0.9.7
+##!! Requires(post):	libcaca-devel
+Requires(post):	libcddb-devel
 Requires(post):	libcdio-devel >= 0.77-3
+Requires(post):	libdc1394-devel >= 2.1.0
 Requires(post):	libdv-devel
 Requires(post):	libdvdread-devel
 Requires(post):  libebml-devel
 Requires(post):	libid3tag-devel
 %{?_with_kate:  Requires(post): libkate-devel}
 Requires(post):	libmatroska-devel >= 0.7.6
+Requires(post):	libmodplug-devel
 Requires(post):	libmpcdec-devel
 Requires(post):	libmtp-devel
 Requires(post):  libnotify-devel
-Requires(post):	librsvg2-devel >= 2.5.0
+##!! Requires(post):	libprojectM-qt-devel
+Requires(post):  libproxy-devel
+Requires(post):	librsvg2-devel >= 2.9.0
+Requires(post):  librtmp-devel
+%if %{?_dist_release} != "vl5"
+Requires(post):	libssh2-devel
+%endif
+##!! Requires(post):	libsysfs-devel
 Requires(post):  libshout-devel
 Requires(post):  libsmbclient-devel
+##!! Requires(post):	libtar-devel
 Requires(post):	libtheora-devel
+##!! Requires(post):	libtiger-devel
 Requires(post):  libtiff-devel
+%if %{?_dist_release} != "vl5"
+Requires(post):	libudev-devel >= 142
+%endif
 Requires(post):  libupnp-devel
 Requires(post):	libv4l-devel
 %if %{?_dist_release} == "vl6"
@@ -82,13 +95,24 @@ Requires(post):	libva-devel
 %endif
 Requires(post):	libvorbis-devel
 Requires(post):  libxml2-devel
+#Requires(post):	lirc-devel
 %{?_with_lirc:Requires(post):	lirc}
+#Requires(post):	live555-devel >= 0-0.19.2008.04.03
 Requires(post):  kernel-headers >= 2.6.20
+# Requires(post):	libGL-devel
+# Requires(post):	libGLU-devel
 Requires(post):  libmusicbrainz-devel
-Requires(post): lua-devel
+Requires(post):  lua-devel
+##!! Requires(post):  minizip-devel
+##!! Requires(post):	mpeg2dec-devel >= 0.3.2
 Requires(post):	ncurses-devel
+##!! Requires(post):  opencv-devel
 Requires(post):	openslp-devel
-Requires(post):  qt4-devel
+Requires(post):  pcre-devel
+Requires(post):  pulseaudio-libs-devel >= 0.9.8
+##!! Requires(post):  portaudio-devel
+Requires(post):  qt4-devel >= 4.5.2
+##!! Requires(post):  schroedinger-devel
 Requires(post):	SDL_image-devel
 Requires(post):	speex-devel >= 1.1.5
 %ifarch %{ix86} x86_64
@@ -96,8 +120,12 @@ Requires(post):  svgalib-devel
 %endif
 Requires(post):  taglib-devel
 Requires(post):	twolame-devel
+%if %{?_dist_release} != "vl5"
+Requires(post):	vcdimager-devel >= 0.7.21
+%endif
 Requires(post):	xosd-devel
 Requires(post):	zlib-devel
+##!! Requires(post):  zvbi-devel
 
 # X-libs
 Requires(post):	libXt-devel
@@ -106,8 +134,9 @@ Requires(post):  libXxf86vm-devel
 Requires(post):  libX11-devel
 Requires(post):  libXext-devel
 Requires(post):  libXpm-devel
-%ifarch %{ix86} x86_64
 Requires(post):  libXvMC-devel
+%if %{?_dist_release} != "vl5"
+Requires(post):  xcb-util-devel
 %endif
 Requires(post):  xorg-x11-proto-devel
 
@@ -142,7 +171,11 @@ Requires(post):	self-build-libdvbpsi
 Requires(post):	self-build-libdvdnav
 Requires(post):	self-build-libmad
 Requires(post):	self-build-libmp4v2
+%if %{?_dist_release} != "vl5"
+Requires(post):	self-build-x264 >= 0.0.0-15.20110322
+%elseif %{?_dist_release} == "vl5"
 Requires(post):	self-build-x264 >= 0.0.0-9.20090522
+%endif
 Requires(post):	self-build-xvidcore
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -240,6 +273,20 @@ mp3, ogg など)だけでなく,DVD や VCD,様々なストリーミング
 
 
 %changelog
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.8-1
+- new upstream release
+- added Requires(post):
+  - libcddb-devel
+  - libdc1394-devel >= 2.1.0
+  - libmodplug-devel
+  - libproxy-devel
+  - librtmp-devel
+  - libssh2-devel
+  - libudev-devel >= 142
+  - pcre-devel
+  - vcdimager-devel >= 0.7.21
+  - xcb-util-devel
+
 * Sat Feb 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.7-1
 - new upstream release
 - dropped upstreamed patches

+ 52 - 36
nonfree/self-build-vlc/vlc-vl.spec

@@ -8,13 +8,12 @@
 #% define with_mozilla	 		1
 %define with_mozilla	 		0
 %define with_dc1394			0
-%define with_directfb			1
 
 %define with_samba			0
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	1.1.7
+Version:	1.1.8
 Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -24,11 +23,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
 Patch0:		vlc-1.1.0-vlc-cache-gen_noerror.patch
-#Patch1:		0001-Libnotify-depends-on-a-gtk.patch
 Patch3:		vlc-1.1.6-hardode_font_patch.patch
 Patch4:		vlc-1.1.4-tls_path.patch
-#Patch5:		vlc-backport-lirc_fix.patch
-#Patch6:         vlc-backport-signal_fix.patch
 
 ## vine
 Patch50:	vlc-1.1.7-revert-pulse-c.patch
@@ -49,10 +45,8 @@ BuildRequires:	avahi-devel
 BuildRequires:  cdparanoia-devel
 BuildRequires:  dbus-devel
 %{?_with_dirac: BuildRequires: dirac-devel >= 1.0.0}
-%if %with_directfb
 #BuildRequires:  directfb-devel
 BuildRequires:  libdirectfb-devel
-%endif
 #BuildRequires:	faac-devel
 #BuildRequires:	faad2-devel
 #BuildRequires:	ffmpeg-devel >= 0.4.9-0
@@ -67,8 +61,9 @@ BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:  libavc1394-devel
 BuildRequires:	libass-devel >= 0.9.7
 ##!! BuildRequires:	libcaca-devel
-##!! BuildRequires:	libcddb-devel
+BuildRequires:	libcddb-devel
 BuildRequires:	libcdio-devel >= 0.77-3
+BuildRequires:	libdc1394-devel >= 2.1.0
 #BuildRequires:	libdca-devel
 BuildRequires:	libdv-devel
 #BuildRequires:	libdvbpsi-devel
@@ -79,22 +74,31 @@ BuildRequires:	libid3tag-devel
 %{?_with_kate:  BuildRequires: libkate-devel}
 #BuildRequires:	libmad-devel
 BuildRequires:	libmatroska-devel >= 0.7.6
-##!! BuildRequires:	libmodplug-devel
+BuildRequires:	libmodplug-devel
 #BuildRequires:	libmp4v2-devel
 BuildRequires:	libmpcdec-devel
 BuildRequires:	libmtp-devel
 BuildRequires:  libnotify-devel
-#BuildRequires:  libproxy-devel
-BuildRequires:	librsvg2-devel >= 2.5.0
+##!! BuildRequires:	libprojectM-qt-devel
+BuildRequires:  libproxy-devel
+BuildRequires:	librsvg2-devel >= 2.9.0
+BuildRequires:  librtmp-devel
+%if %{?_dist_release} != "vl5"
+BuildRequires:	libssh2-devel
+%endif
 ##!! BuildRequires:	libsysfs-devel
 BuildRequires:  libshout-devel
 BuildRequires:  libsmbclient-devel
 ##!! BuildRequires:	libtar-devel
 BuildRequires:	libtheora-devel
+##!! BuildRequires:	libtiger-devel
 BuildRequires:  libtiff-devel
+%if %{?_dist_release} != "vl5"
+BuildRequires:	libudev-devel >= 142
+%endif
 BuildRequires:  libupnp-devel
 BuildRequires:	libv4l-devel
-%if %{?_dist_release} == "vl6"
+%if %{?_dist_release} != "vl5"
 BuildRequires:	libva-devel
 %endif
 BuildRequires:	libvorbis-devel
@@ -117,10 +121,10 @@ BuildRequires:  lua-devel
 BuildRequires:	ncurses-devel
 ##!! BuildRequires:  opencv-devel
 BuildRequires:	openslp-devel
-##!! BuildRequires:  pcre-devel
-##!! BuildRequires:  pulseaudio-libs-devel >= 0.9.8
+BuildRequires:  pcre-devel
+BuildRequires:  pulseaudio-libs-devel >= 0.9.8
 ##!! BuildRequires:  portaudio-devel
-BuildRequires:  qt4-devel
+BuildRequires:  qt4-devel >= 4.5.2
 ##!! BuildRequires:  schroedinger-devel
 BuildRequires:	SDL_image-devel
 BuildRequires:	speex-devel >= 1.1.5
@@ -129,7 +133,9 @@ BuildRequires:  svgalib-devel
 %endif
 BuildRequires:  taglib-devel
 BuildRequires:	twolame-devel
-##!! BuildRequires:	vcdimager-devel >= 0.7.21
+%if %{?_dist_release} != "vl5"
+BuildRequires:	vcdimager-devel >= 0.7.21
+%endif
 #BuildRequires:	x264-devel >= 0-0.8.20061028
 #BuildRequires:	x264-devel >= 0.0.0-2.20080225
 BuildRequires:	xosd-devel
@@ -144,15 +150,12 @@ BuildRequires:  libXxf86vm-devel
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXpm-devel
-%ifarch %{ix86} x86_64
 BuildRequires:  libXvMC-devel
+%if %{?_dist_release} != "vl5"
+BuildRequires:  xcb-util-devel
 %endif
-##!! BuildRequires:  xcb-util-devel
 BuildRequires:  xorg-x11-proto-devel
 
-BuildRequires:  pulseaudio-libs-devel >= 0.9.8
-##!! BuildRequires:  portaudio-devel
-
 %if %with_mozilla
 BuildRequires:  gecko-devel
 BuildRequires:  nspr-devel
@@ -195,7 +198,7 @@ BuildRequires:	mesa-libGL-devel
 ##BuildRequires:	self-build-libdvdnav
 ##BuildRequires:	self-build-libmad
 ##BuildRequires:	self-build-libmp4v2
-##BuildRequires:	self-build-x264 >= 0.0.0-2.20080225
+##BuildRequires:	self-build-x264 >= 0.0.0-15.20110322
 ##BuildRequires:	self-build-xvidcore
 
 
@@ -256,11 +259,9 @@ VLC plugins for libdc1394
 # %setup -q -D -T -a 2 -n %{name}-%{_version}
 # %endif
 %patch0 -p1 -b .noerror
-#%patch1 -p1 -b .gtk23
 %patch3 -p1 -b .hardode_path
 %patch4 -p1 -b .tls_path
-#%patch5 -p1 -b .lirc_fix
-#%patch6 -p1 -b .signal_fix
+#%patch5 -p1 -b .opencv22
 
 ## vine
 %if %{?_dist_release} == "vl5"
@@ -302,43 +303,44 @@ VLC plugins for libdc1394
 	--enable-dc1394				\
 	--enable-dv				\
 %endif
-%if %{?_dist_release} == "vl6"
+%if %{?_dist_release} != "vl5"
 	--enable-libva				\
 %endif
-	--enable-dvdread --enable-dvdnav \
+	--enable-dvdread --enable-dvdnav	\
 	%{?_with_opencv:--enable-opencv} \
 	--enable-sftp				\
-	--enable-v4l				\
 	--enable-pvr				\
 	--enable-gnomevfs			\
-    %{?_with_vcdimager--enable-vcdx} \
+%if %{?_dist_release} != "vl5"
+	--enable-vcdx				\
+%endif
 	--enable-cddax				\
 	--enable-wma-fixed			\
 	--enable-shine				\
+	--enable-omxil				\
 	--enable-faad				\
 	--enable-twolame			\
-	--enable-real				\
-	--enable-realrtsp			\
+	--enable-real --enable-realrtsp		\
 	--enable-flac				\
 	--enable-tremor				\
 	--enable-speex				\
 	--enable-tarkin				\
 	--enable-theora				\
 	%{?_with_dirac:--enable-dirac}		\
-	--enable-libass	\
+	--enable-libass				\
 	--enable-shout				\
-	%{?_with_xcb:--enable-xcb}		\
+%if %{?_dist_release} != "vl5"
+	--enable-xcb				\
+%endif
 	--enable-svg				\
 	--enable-snapshot			\
 %ifarch %{ix86} x86_64
 	--enable-svgalib			\
 	--enable-xvmc				\
 %endif
-%if %with_directfb
 	--enable-directfb			\
-%endif
 	--enable-aa				\
-	%?_with_caca:--enable-caca}				\
+	%{?_with_caca:--enable-caca}	\
 	--enable-jack				\
     %{?_with_portaudio:--enable-portaudio} \
 	--enable-pulse				\
@@ -466,6 +468,20 @@ fi || :
 
 
 %changelog
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.8-1
+- new upstream release
+- added BuildRequires:
+  - libcddb-devel
+  - libdc1394-devel >= 2.1.0
+  - libmodplug-devel
+  - libproxy-devel
+  - librtmp-devel
+  - libssh2-devel
+  - libudev-devel >= 142
+  - pcre-devel
+  - vcdimager-devel >= 0.7.21
+  - xcb-util-devel
+
 * Sat Feb 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.7-1
 - new upstream release
 - dropped upstreamed patches

+ 6 - 3
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	20100625
+%define date	20110322
 %define time	2245
-%define release	14.%{date}%{?_dist_release}
+%define release	15.%{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
@@ -111,7 +111,7 @@ x264 はスクラッチから書かれた H264/AVC ビデオストリームを
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 18000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 19000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -120,6 +120,9 @@ x264 はスクラッチから書かれた H264/AVC ビデオストリームを
 %{_datadir}/%{name}
 
 %changelog
+* Wed Mar 23 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.0-15.20110322
+- updated source snapshot 20110322
+
 * Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.0-14.20100625
 - updated source snapshot 20100625
 

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

@@ -1,10 +1,10 @@
-%define date 20100625
+%define date 20110322
 %define time 2245
 
 Summary: Library for encoding and decoding H264/AVC video streams
 Name: x264
 Version: 0.0.0
-Release: 14.%{date}%{?_dist_release}
+Release: 15.%{date}%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.videolan.org/developers/x264.html
@@ -24,6 +24,9 @@ BuildRequires: yasm
 # in self-build-%{name}.spec as PreReq.
 #BuildRequires: gpac-devel
 
+# # this package is generated by self-build-%{name}
+# Requires: self-build-%{name} = %{version}-%{release}
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Provides:       libx264 = %{version}
@@ -40,6 +43,8 @@ Summary: Development files for the x264 library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+# this package is generated by self-build-%{name}
+Requires: self-build-%{name} = %{version}-%{release}
 
 %description devel
 x264 is a free library for encoding H264/AVC video streams, written from
@@ -65,14 +70,8 @@ iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
     --includedir=%{_includedir} \
     --libdir=%{_libdir} \
     --extra-cflags="$RPM_OPT_FLAGS" \
-    --enable-mp4-output \
-    %{?_with_visualize:--enable-visualize} \
     \
-    --enable-lavf \
-    --disable-ffms \
-    --enable-gpac \
-    --enable-pthread \
-    --enable-asm \
+    %{?_with_visualize:--enable-visualize} \
     --enable-debug \
     --enable-shared \
     --enable-pic \
@@ -102,8 +101,9 @@ iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
 
 %files devel
 %defattr(644, root, root, 0755)
-%doc doc/ratecontrol.txt doc/vui.txt
+%doc doc/*.txt
 %{_includedir}/x264.h
+%{_includedir}/x264_config.h
 %exclude %{_libdir}/libx264.a
 %{_libdir}/libx264.so
 %{_libdir}/pkgconfig/%{name}.pc
@@ -111,6 +111,9 @@ iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
 
 
 %changelog
+* Wed Mar 23 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.0-15.20110322
+- updated source snapshot 20110322
+
 * Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.0-14.20100625
 - updated source snapshot 20100625
 

+ 110 - 0
r/rtmpdump/rtmpdump-vl.spec

@@ -0,0 +1,110 @@
+Name:		rtmpdump
+Version:	2.3
+Release:	1%{?_dist_release}
+Summary:	Toolkit for RTMP streams
+
+Group:		Applications/Internet
+License:	GPLv2+
+# Note that librtmp is actually LGPLv2, so if you package that separately
+# (for which you'd probably want to make it a dynamic library) you should
+# label its licence correctly. But the _tools_ are GPLv2.
+URL:		http://rtmpdump.mplayerhq.hu/
+Source0:	http://rtmpdump.mplayerhq.hu/download/rtmpdump-%{version}.tgz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+
+BuildRequires:	gnutls-devel zlib-devel
+
+%description
+rtmpdump is a toolkit for RTMP streams. All forms of RTMP are supported,
+including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://. 
+
+%package -n librtmp
+Summary:	Support library for RTMP streams
+Group:		Applications/Internet
+License:	LGPLv2+
+
+%description -n librtmp
+librtmp is a suport library for RTMP streams. All forms of RTMP are supported,
+including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://. 
+
+%package -n librtmp-devel
+Summary:	Files for librtmp development
+Group:		Applications/Internet
+License:	LGPLv2+
+Requires:	librtmp = %{version}-%{release}
+
+%description -n librtmp-devel
+librtmp is a suport library for RTMP streams. The librtmp-devel package
+contains include files needed to develop applications using librtmp.
+
+%prep
+%setup -q
+
+%build
+# The fact that we have to add -ldl for gnutls is Fedora bug #611318
+%__make CRYPTO=GNUTLS SHARED=yes OPT="$RPM_OPT_FLAGS" LIB_GNUTLS="-lgnutls -lgcrypt -ldl" LIBRTMP=librtmp/librtmp.so LIBS=
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make CRYPTO=GNUTLS SHARED=yes DESTDIR=$RPM_BUILD_ROOT prefix=/usr mandir=%{_mandir} libdir=%{_libdir} install
+
+%__rm -f $RPM_BUILD_ROOT/%{_libdir}/librtmp.a
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+%post -n librtmp -p /sbin/ldconfig
+
+%postun -n librtmp -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/rtmpdump
+%{_sbindir}/rtmpsrv
+%{_sbindir}/rtmpgw
+%{_sbindir}/rtmpsuck
+%{_mandir}/man1/rtmpdump.1*
+%{_mandir}/man8/rtmpgw.8*
+%doc COPYING README
+
+%files -n librtmp
+%defattr(-,root,root,-)
+%{_libdir}/librtmp.so.0
+%doc librtmp/COPYING
+
+%files -n librtmp-devel
+%defattr(-,root,root,-)
+%{_includedir}/librtmp
+%{_libdir}/librtmp.so
+%{_libdir}/pkgconfig/librtmp.pc
+%{_mandir}/man3/librtmp.3*
+%doc ChangeLog
+
+
+%changelog
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 2.3-1
+- initial build for VineSeed based on RPM Fusion development
+
+* Sun Jul 04 2010 Dominik Mierzejewski <rpm@greysector.net> 2.3-2
+- call ldconfig in post(un) scripts for the shared library
+- add strict dependency on the library to -devel
+
+* Sun Jul 04 2010 David Woodhouse <dwmw2@infradead.org> 2.3-1
+- Update to 2.3; build shared library
+
+* Mon Jun 28 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2.2e-1
+- new upstream release
+
+* Mon Jun 28 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2.2d-1
+- built based on RPM Fusion
+
+* Fri Apr 30 2010 David Woodhouse <dwmw2@infradead.org> 2.2d-1
+- Update to 2.2d
+
+* Tue Apr 20 2010 David Woodhouse <dwmw2@infradead.org> 2.2c-2
+- Link with libgcrypt explicitly since we call it directly
+
+* Mon Apr 19 2010 David Woodhouse <dwmw2@infradead.org> 2.2c-1
+- Initial package