Browse Source

upgrade some self-build packages; remove obsolete self-build packages

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6241 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 10 years ago
parent
commit
76422d5ca5
27 changed files with 222 additions and 1564 deletions
  1. 0 198
      nonfree/self-build-ffmpeg-mh/ffmpeg-mh-vl.spec
  2. 0 208
      nonfree/self-build-ffmpeg-mh/self-build-ffmpeg-mh-vl.spec
  3. 27 10
      nonfree/self-build-ffmpeg/ffmpeg-vl.spec
  4. 24 12
      nonfree/self-build-ffmpeg/self-build-ffmpeg-vl.spec
  5. 4 1
      nonfree/self-build-gpac/gpac-vl.spec
  6. 5 2
      nonfree/self-build-gpac/self-build-gpac-vl.spec
  7. 0 16
      nonfree/self-build-k9copy/k9copy-2.3.5-dso.patch
  8. 0 32
      nonfree/self-build-k9copy/k9copy-2.3.5-mimetype.patch
  9. 13 5
      nonfree/self-build-lame/lame-vl.spec
  10. 12 9
      nonfree/self-build-lame/self-build-lame-vl.spec
  11. 0 169
      nonfree/self-build-libdvdnav/libdvdnav-vl.spec
  12. 0 127
      nonfree/self-build-libdvdnav/self-build-libdvdnav-vl.spec
  13. 0 131
      nonfree/self-build-libmp4v2/libmp4v2-vl.spec
  14. 0 141
      nonfree/self-build-libmp4v2/self-build-libmp4v2-vl.spec
  15. 9 11
      nonfree/self-build-libquicktime/libquicktime-vl.spec
  16. 6 3
      nonfree/self-build-libquicktime/self-build-libquicktime-vl.spec
  17. 0 70
      nonfree/self-build-mplayer/mplayer-config-20100709-vine.patch
  18. 0 59
      nonfree/self-build-mplayer/mplayer-config.patch
  19. 0 31
      nonfree/self-build-mplayer/mplayer-manlinks.patch
  20. 0 43
      nonfree/self-build-mplayer/mplayer-nodvdcss.patch
  21. 0 37
      nonfree/self-build-mplayer/mplayer-snapshot-vine.sh
  22. 44 49
      nonfree/self-build-mplayer/mplayer-vl.spec
  23. 14 17
      nonfree/self-build-mplayer/self-build-mplayer-vl.spec
  24. 18 44
      nonfree/self-build-vlc/self-build-vlc-vl.spec
  25. 25 111
      nonfree/self-build-vlc/vlc-vl.spec
  26. 9 11
      nonfree/self-build-x264/self-build-x264-vl.spec
  27. 12 17
      nonfree/self-build-x264/x264-vl.spec

+ 0 - 198
nonfree/self-build-ffmpeg-mh/ffmpeg-mh-vl.spec

@@ -1,198 +0,0 @@
-%define name ffmpeg-mh
-%define version 0.33
-%define svndate 051130
-%define release 12%{?_dist_release}
-
-%define ffmpeg_mh ffmpeg_%{svndate}
-
-# %define amrnbver 7.1.0.2
-# %define amrwbver 7.0.0.3
-#% define _with_amr 1
-
-%define _with_x264_mh 1
-%define x264_mh x264_051028
-
-Summary: 3GP Converter (Keitai Douga Henkan-kun) for UNIX---FFmpeg Mobile Hack version
-Summary(ja): Windows 用携帯動画変換君(3GP Converter)の UNIX 版
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Source: http://www.nurs.or.jp/~calcium/3gpp/sources/ffmpeg-%{svndate}-%{version}.tar.gz
-# x264_051028.tar.gz: from http://mobilehackerz.jp/contents?plugin=attach&refer=3GPConv%2FSources&openfile=x264_051028.tar.gz
-# on http://mobilehackerz.jp/contents/3GPConv/Sources
-%if %{_with_x264_mh}
-Source1: x264_051028.tar.gz
-%endif
-# Source1: http://ftp.penguin.cz/pub/users/utx/amr/amrnb-%{amrnbver}.tar.bz2
-# Source2: http://ftp.penguin.cz/pub/users/utx/amr/amrwb-%{amrwbver}.tar.bz2
-Patch: http://can.homeunix.org/sw/psp/ffmpeg_psp/ffmpeg-mh-unix.patch
-#Patch1: ffmpeg-mh-include-amr.patch
-Patch2: ffmpeg-mh-0.33-disable-texi2html.patch
-License: GPL
-Group: Applications/Multimedia
-URL: http://www.nurs.or.jp/~calcium/3gpp/
-
-#Requires: 
-BuildRequires: zlib-devel, SDL-devel, imlib2-devel
-#BuildRequires: texi2html
-BuildRequires: libogg-devel, libvorbis-devel, libtheora-devel
-# *-devel pacages 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, faad2-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-%description
-FFMpeg is a complete and free Internet live audio and video
-broadcasting solution for Linux/Unix. It also includes a digital
-VCR. It can encode in real time in many formats including MPEG1 audio
-and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
-
-ffmpeg-mh is a 3GP Converter for UNIX. It is a FFmpeg Mobile Hack version 
-under unix, is enoughly customized for many mobiles from original sources 
-of ffmpeg. 
-
-%description -l ja
-FFMpeg は Linux/Unix に対する完全にフリーなインターネットライブ
-オーティオ・ビデオブロードキャスティングソリューションです.
-またデジタル VCR を含んでいます.MPEG1 オーディオ・ビデオ,
-MPEG4, h263, ac3, asf, avi, real, mjpeg, flash を含む
-多様なフォーマットをリアルタイムにエンコードすることができます.
-
-ffmpeg-mh は Windows 用携帯動画変換君(3GP Converter)の UNIX 版です.
-FFmpeg のモバイル端末向けに改良されたバージョンで,オリジナルのソースから
-モバイル向けにたくさん調整されています.
-
-%prep
-%setup -q -n %{ffmpeg_mh}
-%patch -p1
-#%patch1 -p1 -b include
-
-# tar jxvf %{SOURCE1}
-# tar jxvf %{SOURCE2}
-
-## use x264 for Mobile Hack version
-%if %{_with_x264_mh}
-tar zxvf %{SOURCE1}
-%endif
-
-%build
-# ## build amr
-# cd amrnb-%{amrnbver}
-# ./configure \
-#     --prefix=${RPM_BUILD_DIR}/%{ffmpeg_mh} \
-#     --includedir=${RPM_BUILD_DIR}/%{ffmpeg_mh}/include/amr \
-#     --enable-static --disable-shared
-# %{__make} %{?_smp_mflags} OPT_CFLAGS="$RPM_OPT_FLAGS"
-# %{__make} install
-# cd ..
-# cd amrwb-%{amrwbver}
-# ./configure \
-#     --prefix=${RPM_BUILD_DIR}/%{ffmpeg_mh} \
-#     --includedir=${RPM_BUILD_DIR}/%{ffmpeg_mh}/include/amr_float \
-#     --enable-static --disable-shared
-# %{__make} %{?_smp_mflags} OPT_CFLAGS="$RPM_OPT_FLAGS"
-# %{__make} install
-# cd ..
-
-## build x264 for Mobile Hack version
-%if %{_with_x264_mh}
-cd %{x264_mh}
-./configure \
-    --prefix=${RPM_BUILD_DIR}/%{ffmpeg_mh} \
-    --enable-pthread \
-    --enable-static \
-    --disable-shared
-%__make
-%__make install
-cd ..
-%endif
-
-## configure ffmpeg-mh
-./configure \
-    --prefix=%{_prefix} \
-    --incdir=%{_includedir}/%{name} \
-    --libdir=%{_libdir} \
-    --shlibdir=%{_libdir} \
-    --mandir=%{_mandir} \
-    %{?_with_x264_mh:--extra-cflags=-I${RPM_BUILD_DIR}/%{ffmpeg_mh}/include} \
-    %{?_with_x264_mh:--extra-ldflags=-L${RPM_BUILD_DIR}/%{ffmpeg_mh}/lib} \
-    %{?_with_x264_mh:--enable-x264} \
-    --disable-debug \
-    --enable-mp3lame \
-    --enable-libogg \
-    --enable-vorbis \
-    --enable-faad \
-    --enable-faac \
-    --enable-xvid \
-    --enable-a52 \
-    %{?_with_amr:--enable-amr_nb --enable-amr_nb-fixed --enable-amr_wb} \
-    --enable-pp \
-    --enable-pthreads \
-    --enable-gpl \
-    --enable-static \
-    --disable-shared \
-    --disable-ffserver \
-    --disable-ffplay
-
-## build ffmpeg-mh
-%{__make} %{?_smp_mflags}
-
-%install
-%{__rm} -rf $RPM_BUILD_ROOT
-
-## install ffmpeg-mh
-install -d -m755 %{buildroot}/%{_bindir}
-install -m 755 ffmpeg %{buildroot}/%{_bindir}/%{name}
-
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%{_bindir}/ffmpeg-mh
-
-
-%changelog
-* Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.33-12
-- change release to sync with self-build-ffmpeg-mh
-
-* Thu Feb 18 2010 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-11
-- rebuild
-
-* Tue May 26 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-10
-- change release to sync with self-build-ffmpeg-mh
-
-* Wed May 13 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-9
-- applied ffmpeg-mh-0.33-disable-texi2html.patch
-  - dropped BuildRequires: texi2html
-
-* Sun Feb 8 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-8
-- changed to PreReq:  self-build-faad2 >= 2.0 from faad2-devel 
-
-* Sun Feb 01 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-7
-- change release to sync with self-build-ffmpeg-mh
-
-* Sun Nov 02 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-6
-- added x264_051028 for Mobile Hack version
-- dropped BuildRequires: self-build-x264
-
-* Sun Nov 02 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-5
-- spec in utf8
-- droppd BuildRequires: xvidcore-devel, faac-devel, lame-devel
-  BuildRequires: x264-devel, libdca-devel, a52dec-devel
-  (*-devel pacages provided by other self-build-*) in ffmpeg-mh.spec
-
-* Thu Apr 10 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-1vl4
-- build with new versioning policy
-
-* Thu Mar 13 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-0vl2
-- [self-build-ffmpeg-mh.spec]
-  For all pre-required package that is provied by self-build,  
-  changed to its self-build package
-
-* Tue Mar 11 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-0vl1
-- initial build for Vine Linux 4.2
-  with ffmpeg-051130-0.33
-
-### end of file

+ 0 - 208
nonfree/self-build-ffmpeg-mh/self-build-ffmpeg-mh-vl.spec

@@ -1,208 +0,0 @@
-%define pkgname ffmpeg-mh
-%define name	self-build-%{pkgname}
-%define version 0.33
-%define svndate 051130
-%define release	12%{?_dist_release}
-
-%define ffmpeg_mh ffmpeg_%{svndate}
-
-#%%define sourceurl http://www.nurs.or.jp/~calcium/3gpp/sources/ffmpeg-%{svndate}-%{version}.tar.gz
-
-# %define amrnbver 7.1.0.2
-# %define amrwbver 7.0.0.3
-#% define _with_amr 1
-
-%define _with_x264_mh 1
-%define x264_mh x264_051028
-
-Summary:	Package to automatically build %{pkgname} rpm package
-Summary(ja):	%{pkgname} の rpm パッケージを自動作成するパッケージ
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
-Source0:	%{pkgname}-vl.spec
-#Source1:	http://mobilehackerz.jp/contents?plugin=attach&refer=3GPConv%2FSources&openfile=ffmpeg-%{svndate}-%{version}.tar.gz
-Source1:	ffmpeg-%{svndate}-%{version}.tar.gz
-# x264_051028.tar.gz: from http://mobilehackerz.jp/contents?plugin=attach&refer=3GPConv%2FSources&openfile=x264_051028.tar.gz
-# on http://mobilehackerz.jp/contents/3GPConv/Sources
-%if %{_with_x264_mh}
-Source2:        x264_051028.tar.gz
-%endif
-Source10:       ffmpeg-mh-unix.patch
-#Source11:       ffmpeg-mh-include-amr.patch
-Source12:       ffmpeg-mh-0.33-disable-texi2html.patch 
-
-License:	GPL
-Group:		Restricted Software
-
-Requires(post):		self-build-setup >= 0.9.9
-
-# (build)requies of target package.
-Requires(post):		zlib-devel, SDL-devel, imlib2-devel
-#Requires(post):	texi2html
-Requires(post):		libogg-devel, libvorbis-devel, libtheora-devel
-Requires(post):		self-build-xvidcore self-build-faac self-build-lame 
-Requires(post):		self-build-libdca self-build-a52dec self-build-faad2
-#Requires(post):		self-build-x264
-##Requires(post):		xvidcore-devel, faac-devel, lame-devel
-##Requires(post):		x264-devel, libdca-devel, a52dec-devel
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-Packager:	munepi
-
-%description
-FFMpeg is a complete and free Internet live audio and video
-broadcasting solution for Linux/Unix. It also includes a digital
-VCR. It can encode in real time in many formats including MPEG1 audio
-and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
-
-ffmpeg-mh is a 3GP Converter for UNIX. It is a FFmpeg Mobile Hack version 
-under unix, is enoughly customized for many mobiles from original sources 
-of ffmpeg. 
-
-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]
-Before building this package, you need to install the following 
-self-build packages: 
-self-build-xvidcore self-build-faac self-build-lame self-build-x264 self-build-libdca self-build-a52dec
-
-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
-FFMpeg は Linux/Unix に対する完全にフリーなインターネットライブ
-オーティオ・ビデオブロードキャスティングソリューションです.
-またデジタル VCR を含んでいます.MPEG1 オーディオ・ビデオ,
-MPEG4, h263, ac3, asf, avi, real, mjpeg, flash を含む
-多様なフォーマットをリアルタイムにエンコードすることができます.
-
-ffmpeg-mh は Windows 用携帯動画変換君(3GP Converter)の UNIX 版です.
-FFmpeg のモバイル端末向けに改良されたバージョンで,オリジナルのソースから
-モバイル向けにたくさん調整されています.
-
-このパッケージをインストールすると、自動的にソースコードを
-ダウンロードしてコンパイルし、%{pkgname}-%{version}
-の rpm パッケージを作成します。
-また apt-get コマンドや synaptic パッケージマネージャから実行
-した場合は、作成された rpm パッケージのインストールも自動的に
-行います。
-
-[注意]
-このパッケージをビルドするより前に,以下の self-build パッケージを
-インストールしておく必要があります.
-self-build-xvidcore self-build-faac self-build-lame self-build-x264 self-build-libdca self-build-a52dec
-
-コンパイルに必要な多くの関連パッケージを要求するので通常より
-ディスクの領域を多く消費します。
-またインストール時にコンパイルを行うため、通常より時間がかか
-る場合があります。(環境にもよりますが数分から数十分程度)
-
-[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 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%if %{_with_x264_mh}
-%{__install} -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%endif
-%{__install} -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE12} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-
-%clean
-%{__rm} -rf ${RPM_BUILD_ROOT}
-
-%posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec 160000
-#/usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release}
-
-%files
-%defattr(-,root,root)
-%{_datadir}/%{name}
-
-%changelog
-* Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.33-12
-- renamed %%{Source0} to ffmpeg-mh-vl.spec
-
-* Thu Feb 18 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.33-11
-- rebuild
-
-* Tue May 26 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-10
-- avoided to execute self-build-rpm.sh on RPM transaction
-  - moved %%post actions to %%posttrans
-
-* Wed May 13 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-9
-- added BuildArch: noarch
-- added ffmpeg-mh-0.33-disable-texi2html.patch
-  - dropped PreReq: texi2html
-
-* Sun Feb 8 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-8
-- changed to PreReq:  self-build-faad2 >= 2.0 from faad2-devel
-
-* Sun Feb 1 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-7
-- fixed %%files section
-
-* Sun Dec 14 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-6
-- added x264_051028 for Mobile Hack version
-- dropped PreReq: self-build-x264
-
-* Sun Nov 02 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-5
-- spec in utf8
-- droppd BuildRequires: xvidcore-devel, faac-devel, lame-devel
-  BuildRequires: x264-devel, libdca-devel, a52dec-devel
-  (*-devel pacages provided by other self-build-*) in ffmpeg-mh.spec
-
-* Thu Apr 10 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-1vl4
-- build with new versioning policy
-
-* Wed Apr 09 2008 Atsushi SHICHI <ats777@gmail.com> 0.33-0vl3
-- add "Source1: ffmpeg-%{svndate}-%{version}.tar.gz",
-  include Source1 in the binary package.
-
-* Tue Mar 11 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-0vl2
-- For all pre-required package that is provied by self-build,  
-  changed to its self-build package
-
-* Tue Mar 11 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.33-0vl1
-- initial build for Vine Linux 4.2
-  with ffmpeg-051130-0.33
-
-### end of file

+ 27 - 10
nonfree/self-build-ffmpeg/ffmpeg-vl.spec

@@ -12,16 +12,13 @@
 
 Summary:	Digital VCR and streaming server
 Name:		ffmpeg
-Version:	0.9.1
+Version:	0.11
 Release:	1%{?svndate:.%svndate}%{?_dist_release}
 Source:		http://ffmpeg.org/releases/%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
-Source1:        %{name}-snapshot.sh
 
 # pre-built man files
-%if %{use_prebuilt_man}
-#$ tar Jcvf ~/rpm/SOURCES/ffmpeg/ffmpeg-0.9-doc.tar.xz ffmpeg-0.9/doc/*.html ffmpeg-0.9/doc/*.pod ffmpeg-0.9/doc/*.1
-Source90:       ffmpeg-%{version}-doc.tar.xz
-%endif
+#$ tar Jcvf ~/rpm/SOURCES/ffmpeg/ffmpeg-0.10-doc.tar.xz ffmpeg-0.10/doc/*.html ffmpeg-0.10/doc/*.pod ffmpeg-0.10/doc/*.1
+%{?use_prebuilt_man:Source90:       ffmpeg-%{version}-doc.tar.xz}
 
 %if 0%{?_with_amr:1}
 License:        GPLv3+
@@ -39,6 +36,10 @@ BuildRequires:	gsm-devel
 BuildRequires:	imlib2-devel
 BuildRequires:	libdc1394-devel
 BuildRequires:	libogg-devel
+BuildRequires:  libass-devel
+%{!?_without_cdio:BuildRequires: libcdio-devel}
+#libcrystalhd is currently broken
+%{?_with_crystalhd:BuildRequires: libcrystalhd-devel}
 BuildRequires:	libraw1394-devel
 BuildRequires:	librtmp-devel >= 2.3
 BuildRequires:	libtheora-devel
@@ -46,8 +47,11 @@ BuildRequires:	libtheora-devel
 BuildRequires:  libvdpau-devel
 BuildRequires:	libvorbis-devel
 %{?with_libvpx:BuildRequires:  libvpx-devel >= 0.9.6}
+BuildRequires:  libXvMC-devel
 %{?_with_opencore_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
-##BuildRequires:  openjpeg-devel
+%{!?_without_openal:BuildRequires: openal-soft-devel}
+%{?_with_opencv:BuildRequires: opencv-devel}
+%{?_with_openjpeg:BuildRequires:  openjpeg-devel}
 ##BuildRequires:  schroedinger-devel
 BuildRequires:	SDL-devel
 BuildRequires:  speex-devel
@@ -67,6 +71,8 @@ Requires:	%{name}-libs = %{version}-%{release}
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
+Obsoletes:      ffmpeg < %{version}, ffmpeg-libs < %{version}, ffmpeg-devel < %{version}
+
 %description
 FFMpeg is a complete and free Internet live audio and video
 broadcasting solution for Linux/Unix. It also includes a digital
@@ -102,9 +108,7 @@ This package contains development files for %{name}.
 
 %prep
 %setup -q -n %{name}-%{?svndate:%svndate}%{!?svndate:%version}
-%if %{use_prebuilt_man}
-tar -C .. -xf %{SOURCE90}
-%endif
+%{?use_prebuilt_man:tar -C .. -xf %{SOURCE90}}
 
 %build
 %ifarch ppc
@@ -130,7 +134,12 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
     --extra-cflags="$RPM_OPT_FLAGS" \
     %{?_with_opencore_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \
     --enable-bzlib \
+    %{!?_with_crystalhd:--disable-crystalhd} \
     --enable-zlib \
+    %{?_with_frei0r:--enable-frei0r} \
+    --enable-gnutls \
+    --enable-libass \
+    %{!?_without_cdio:--enable-libcdio} \
     --enable-libcelt \
     --enable-libdc1394 \
     %{?_with_libdirac:--enable-libdirac} \
@@ -138,6 +147,8 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
     --enable-libfreetype \
     --enable-libgsm \
     --enable-libmp3lame \
+    %{!?_without_openal:--enable-openal} \
+    %{?_with_opencv:--enable-libopencv} \
     %{?_with_openjpeg:--enable-libopenjpeg} \
     --enable-librtmp \
     --enable-libspeex \
@@ -214,6 +225,12 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 
 %changelog
+* Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.11-1
+- new upstream release
+
+* Sat Feb 18 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.10-1
+- new upstream release
+
 * Wed Jan 11 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.9.1-1
 - new upstream release
 

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

@@ -6,20 +6,20 @@
 
 %global pkgname ffmpeg
 %global name	self-build-%{pkgname}
-%global version 0.9.1
+%global version 0.11
 #% define svndate	20110326
 %global release	1%{?svndate:.%svndate}%{?_dist_release}
 
 %global sourceurl0	http://ffmpeg.org/releases/%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 
-## available for v0.6 or lower
-%global with_libfaad 1
-
 %global with_faac 1
-
 %global with_vaapi 1
 %global with_libvpx 1
 
+#% define enable_avconv 1
+
+%define use_prebuilt_man 1
+
 Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
 Name:		%{name}
@@ -27,13 +27,15 @@ Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
 #Source1:	%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
-Source2:        %{pkgname}-snapshot.sh
 # pre-built man files
-Source90:       ffmpeg-%{version}-doc.tar.xz
+%{?use_prebuilt_man:Source90:       ffmpeg-%{version}-doc.tar.xz}
 
 License:	GPLv2+
 Group:		Restricted Software
 
+Obsoletes:      ffmpeg < %{version}, ffmpeg-libs < %{version}, ffmpeg-devel < %{version}
+Obsoletes:      self-build-ffmpeg < %{version}
+
 Requires(post):		self-build-setup >= 0.9.9
 #Requires(post):		subversion
 
@@ -45,6 +47,11 @@ Requires(post):  freetype2-devel
 Requires(post):	gsm-devel
 Requires(post):	imlib2-devel
 Requires(post):	libdc1394-devel
+Requires(post):	libogg-devel
+Requires(post):  libass-devel
+%{!?_without_cdio:Requires(post): libcdio-devel}
+#libcrystalhd is currently broken
+%{?_with_crystalhd:Requires(post):	libcrystalhd-devel}
 Requires(post):	libraw1394-devel
 Requires(post):	librtmp-devel >= 2.3
 Requires(post):	libtheora-devel
@@ -52,8 +59,11 @@ Requires(post):	libtheora-devel
 Requires(post):  libvdpau-devel
 Requires(post):	libvorbis-devel
 %{?with_libvpx:Requires(post):  libvpx-devel >= 0.9.6}
+Requires(post):  libXvMC-devel
 %{?_with_opencore_amr:Requires(post):  opencore-amr-devel vo-amrwbenc-devel}
-##Requires(post):  openjpeg-devel
+%{!?_without_openal:Requires(post):  openal-soft-devel}
+%{?_with_opencv:Requires(post):  opencv-devel}
+%{?_with_openjpeg:Requires(post):  openjpeg-devel}
 ##Requires(post):  schroedinger-devel
 Requires(post):	SDL-devel
 Requires(post):  speex-devel
@@ -66,7 +76,7 @@ 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.0.0-18.20111216
+Requires(post):		self-build-x264 >= 0.120
 Requires(post):		self-build-xvidcore
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -146,14 +156,13 @@ 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 %{SOURCE90} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+%{?use_prebuilt_man:%{__install} -m 644 %{SOURCE90} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-#/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec 77000
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 77000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 123000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-libs-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
@@ -184,6 +193,9 @@ Rebuild_gpac_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.11-1
+- new upstream release
+
 * Wed Jan 11 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.9.1-1
 - new upstream release
 

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

@@ -5,7 +5,7 @@
 Name:        gpac
 Summary:     MPEG-4 multimedia framework
 Version:     0.4.6
-Release:     1%{?svndate:.svn%svndate}%{?_dist_release}
+Release:     2%{?svndate:.svn%svndate}%{?_dist_release}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 URL:         http://gpac.sourceforge.net/
@@ -208,6 +208,9 @@ done
 
 
 %changelog
+* Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.6-2.svn20111217
+- rebuild
+
 * Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.6-1.svn20111217
 - update snapshot svn20111217
 - removed upstreamed/obsolated patches

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

@@ -3,7 +3,7 @@
 %define pkgname gpac
 %define name	self-build-%{pkgname}
 %define version 0.4.6
-%define release	1%{?svndate:.svn%svndate}%{?_dist_release}
+%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
@@ -179,7 +179,7 @@ su $BUILD_USER -c "/bin/bash %{_datadir}/%{name}/%{pkgname}-snapshot-vine.sh >/d
 %__mv %{pkgname}-%{svndate}.tar.bz2 %{_datadir}/%{name}/ || exit 1
 )
 
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec 169000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec 107000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-libs-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release} \
@@ -191,6 +191,9 @@ su $BUILD_USER -c "/bin/bash %{_datadir}/%{name}/%{pkgname}-snapshot-vine.sh >/d
 %{_datadir}/%{name}
 
 %changelog
+* Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.6-2.svn20111217
+- rebuild
+
 * Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.6-1.svn20111217
 - update snapshot svn20111217
 - removed upstreamed/obsolated patches

+ 0 - 16
nonfree/self-build-k9copy/k9copy-2.3.5-dso.patch

@@ -1,16 +0,0 @@
-diff -up k9copy-2.3.5-Source/CMakeLists.txt.dso k9copy-2.3.5-Source/CMakeLists.txt
---- k9copy-2.3.5-Source/CMakeLists.txt.dso	2010-02-07 05:30:38.000000000 -0600
-+++ k9copy-2.3.5-Source/CMakeLists.txt	2010-06-13 15:33:05.618165751 -0500
-@@ -325,9 +325,10 @@ kde4_add_executable(k9copy ${k9copy_SRCS
- kde4_add_executable(k9play ${k9play_SRCS})
- kde4_add_executable(k9xineplayer ${k9xineplayer_SRCS})
- 
-+target_link_libraries(k9copy ${KDE4_SOLID_LIBS} -ldl )
- target_link_libraries(k9copy k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS}  -lphonon )
--target_link_libraries(k9play k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS}  )
--target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} -lxine )
-+target_link_libraries(k9play k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} -ldl )
-+target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${X11_X11_LIB} -lxine )
- 
- 
- install(TARGETS k9copy DESTINATION ${BIN_INSTALL_DIR} )

+ 0 - 32
nonfree/self-build-k9copy/k9copy-2.3.5-mimetype.patch

@@ -1,32 +0,0 @@
-diff -up k9copy-2.3.5-Source/k9copy_assistant.desktop.mimetype k9copy-2.3.5-Source/k9copy_assistant.desktop
---- k9copy-2.3.5-Source/k9copy_assistant.desktop.mimetype	2010-02-07 05:30:38.000000000 -0600
-+++ k9copy-2.3.5-Source/k9copy_assistant.desktop	2010-06-13 15:08:11.298178656 -0500
-@@ -12,9 +12,9 @@ GenericName=Video DVD Backup
- GenericName[fr]=Backup de DVD Video
- GenericName[tr]=DVD Vidyo Yedekleme Aracı
- GenericName[ru]=Копирование с видео-DVD
--MimeTypes=
-+MimeType=
- Terminal=false
- Icon=k9copy
- X-DocPath=k9copy/index.html
- Categories=Qt;KDE;AudioVideo;DiscBurning;
--X-KDE-StartupNotify=true
-\ No newline at end of file
-+X-KDE-StartupNotify=true
-diff -up k9copy-2.3.5-Source/k9copy.desktop.mimetype k9copy-2.3.5-Source/k9copy.desktop
---- k9copy-2.3.5-Source/k9copy.desktop.mimetype	2010-02-07 05:30:38.000000000 -0600
-+++ k9copy-2.3.5-Source/k9copy.desktop	2010-06-13 15:08:01.364178993 -0500
-@@ -12,9 +12,9 @@ GenericName=Video DVD Backup
- GenericName[fr]=Backup de DVD Video
- GenericName[tr]=DVD Vidyo Yedekleme Aracı
- GenericName[ru]=Копирование с видео-DVD
--MimeTypes=
-+MimeType=
- Terminal=false
- Icon=k9copy
- X-DocPath=k9copy/index.html
- Categories=Qt;KDE;AudioVideo;DiscBurning;
--X-KDE-StartupNotify=true
-\ No newline at end of file
-+X-KDE-StartupNotify=true

+ 13 - 5
nonfree/self-build-lame/lame-vl.spec

@@ -1,14 +1,15 @@
 Summary:	LAME Ain't an MP3 Encoder... but it's the best.
 Name:		lame
-Version:	3.98.4
-Release:	2%{?_dist_release}
-License:	LGPL
+Version:	3.99.5
+Release:	1%{?_dist_release}
+License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://lame.sourceforge.net/
 #Source:		http://prdownloads.sourceforge.net/lame/lame-%{version}.tar.gz
 Source:		http://prdownloads.sourceforge.net/lame/lame-%{version}.tar.gz
 Patch1:         %{name}-noexecstack.patch
-Patch2:         %{name}-pmake.patch
+
+Patch10:        lame-3.99-libs-termcap.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -55,7 +56,7 @@ applications with lame.
 %setup -q
 
 %patch1 -p1 -b .noexec
-%patch2 -p1 -b .pmake
+%patch10 -p1 -b .termcap
 
 %build
 %__sed -i -e 's/^\(\s*hardcode_libdir_flag_spec\s*=\).*/\1/' configure
@@ -126,6 +127,13 @@ export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
 %{_includedir}/lame.h
 
 %changelog
+* Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 3.99.5
+- new upstream release
+
+* Wed Oct 19 2011 Munehiro Yamamoto <munepi@vinelinux.org> 3.99-1
+- new upstream release
+- applied lame-3.99-libs-termcap.patch
+
 * Sun Sep 11 2011 Munehiro Yamamoto <munepi@vinelinux.org> 3.98.4-2
 - change release to sync with self-build-lame
 

+ 12 - 9
nonfree/self-build-lame/self-build-lame-vl.spec

@@ -1,7 +1,7 @@
 %define pkgname lame
 %define name	self-build-%{pkgname}
-%define version	3.98.4
-%define release	2%{?_dist_release}
+%define version	3.99.5
+%define release	1%{?_dist_release}
 
 #% define sourceurl http://prdownloads.sourceforge.net/lame/lame-%{version}.tar.gz
 %define sourceurl http://prdownloads.sourceforge.net/lame/lame-%{version}.tar.gz
@@ -12,13 +12,13 @@ Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
-Source1:	%{pkgname}-noexecstack.patch
-Source2:	%{pkgname}-pmake.patch
+Source101:	lame-noexecstack.patch
+Source110:	lame-3.99-libs-termcap.patch
 
-License:	GPL
+License:	GPLv2+
 Group:		Restricted Software
 
-Requires(post):		self-build-setup >= 0.8
+Requires(post):		self-build-setup >= 1.0.0
 
 # (build)requies of target package.
 %{?enable_brhist:Requires(post):	ncurses}
@@ -96,15 +96,15 @@ lame はオープンソースで開発されている mp3 エンコーダです
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+%{__install} -m 644 %{SOURCE101} %{SOURCE110} \
+    ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec %{sourceurl} 65000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec %{sourceurl} 61000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-mp3x-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
@@ -115,6 +115,9 @@ lame はオープンソースで開発されている mp3 エンコーダです
 %{_datadir}/%{name}
 
 %changelog
+* Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 3.99.5
+- new upstream release
+
 * Sun Sep 11 2011 Munehiro Yamamoto <munepi@vinelinux.org> 3.98.4-2
 - added BuildArch: noarch
 - disable the VBR bitrate histgrum feature

+ 0 - 169
nonfree/self-build-libdvdnav/libdvdnav-vl.spec

@@ -1,169 +0,0 @@
-Name:           libdvdnav
-Version:        4.1.3
-Release:        5%{?_dist_release}
-Summary:        A library for reading DVD video discs based on Ogle code
-
-Group:          System Environment/Libraries
-License:        GPLv2+
-Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-
-BuildRequires:  doxygen
-BuildRequires:  libdvdread-devel >= 4.1.3-1
-
-%description
-libdvdnav provides a simple library for reading DVD video discs.
-The code is based on Ogle and used in, among others, the Xine dvdnav plug-in.
-
-%package        devel
-Summary:        Development files for libdvdnav
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       libdvdread-devel >= 4.1.3-1
-Requires:       pkgconfig
-
-%description    devel
-libdvdnav-devel contains the files necessary to build packages that use the
-libdvdnav library.
-
-%prep
-%setup -q
-
-%build
-./configure2 \
-    --disable-opts \
-    --disable-static \
-    --disable-strip \
-    --extra-cflags="%{optflags}" \
-    --libdir=%{_libdir} \
-    --prefix=%{_prefix} \
-    --shlibdir=%{_libdir} \
-    --with-dvdread-config="pkg-config dvdread" \
-
-%{__make} %{?_smp_mflags}
-pushd doc
-doxygen doxy.conf
-popd
-
-%install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-%{__install} -d -m 755 %{buildroot}/%{_datadir}/aclocal
-%{__install} -p -m 644 m4/dvdnav.m4 %{buildroot}/%{_datadir}/aclocal
-
-%clean
-%{__rm} -rf %{buildroot}
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_libdir}/libdvdnav.so.*
-%{_libdir}/libdvdnavmini.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%doc doc/html/*
-%{_bindir}/dvdnav-config
-%{_libdir}/libdvdnav.so
-%{_libdir}/libdvdnavmini.so
-%{_includedir}/dvdnav
-%{_datadir}/aclocal/dvdnav.m4
-%{_libdir}/pkgconfig/dvdnav.pc
-%{_libdir}/pkgconfig/dvdnavmini.pc
-
-%changelog
-* Sun Mar 21 2010 Munehiro Yamamoto <munepi@vinelinux.org> 4.1.3-5
-- change release to sync with self-build-libdvdnav
-
-* Tue May 26 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 4.1.3-4
-- change release to sync with self-build-libdvdnav
-
-* Sat Jan 24 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 4.1.3-3
-- change release to sync with self-build-libdvdnav
-
-* Sat Dec 27 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 4.1.3-2
-- change release to sync with self-build-libdvdnav
-
-* Sun Nov 02 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 4.1.3-1
-- initial bulid based on Fedora package
-
-* Tue Sep 09 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.3-1
-- update to 4.1.3 final
-
-* Sun Aug 31 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.3-0.4.rc1
-- update to 4.1.3rc1
-- require libdvdread with fixed API
-
-* Fri Jul 25 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.3-0.3
-- add missing file to -devel
-
-* Thu Jul 17 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.3-0.2
-- update to current SVN
-- use new external libdvdread
-
-* Fri Jun 06 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.3-0.1
-- update to current SVN (pre-4.1.3)
-- macroize
-- re-enable parallel make
-
-* Sun Apr 13 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.2-1
-- update to 4.1.2
-- drop obsolete patches (merged upstream)
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 4.1.1-6
-- Autorebuild for GCC 4.3
-
-* Sun Jan 27 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.1-5
-- fix missing <inttypes.h> include (bug 428910)
-
-* Sun Jan 06 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.1-4
-- make sure -devel requires our version of libdvdread-devel
-
-* Thu Nov 22 2007 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.1-3
-- fix build with internal libdvdread
-
-* Wed Nov 21 2007 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.1-2
-- use upstream non-autotools buildsystem
-- build with external libdvdread for older releases
-- fix version.h
-- fix soname
-- fix lib paths on 64bit
-
-* Thu Nov 01 2007 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.1-1
-- switch to new upstream
-- libdvdread comes from here now
-- apply dvdread udf-related fixes from upstream SVN
-
-* Sun Aug 19 2007 Dominik Mierzejewski <rpm[AT]greysector.net> 0.1.10-4.20070819
-- update to current snapshot
-- specfile cleanups
-
-* Thu May 03 2007 Dominik Mierzejewski <rpm[AT]greysector.net> 0.1.10-3.20070503
-- update to current snapshot from new upstream
-- clean up some specfile cruft
-- disable static libs
-- drop unnecessary explicit dependency on libdvdread
-
-* Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 0.1.10-2
-- Drop Epoch completely
-
-* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- switch to new release field
-- drop Epoch
-
-* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- add dist
-
-* Wed Oct 13 2004 Ville Skytt霎ー <ville.skytta at iki.fi> - 0:0.1.10-0.lvn.1
-- Update to 0.1.10.
-- Disable dependency tracking to speed up the build.
-
-* Wed Jun 25 2003 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0:0.1.9-0.fdr.2: incorporated bugzilla suggestions, new release
-
-* Thu May 29 2003 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0:0.1.9-0.fdr.1: initial RPM release

+ 0 - 127
nonfree/self-build-libdvdnav/self-build-libdvdnav-vl.spec

@@ -1,127 +0,0 @@
-%define pkgname libdvdnav
-%define name	self-build-%{pkgname}
-%define version 4.1.3
-%define release	5%{?_dist_release}
-
-%define source0path	MPlayer/releases/dvdnav/%{pkgname}-%{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
-
-License:	GPLv2+
-Group:		Restricted Software
-
-Requires(post):		self-build-setup >= 0.9.9
-
-Requires(post):		doxygen
-Requires(post):		libdvdread-devel >= 4.1.3-1
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-Packager:	munepi
-
-%description
-libdvdnav provides a simple library for reading DVD video discs.
-The code is based on Ogle and used in, among others, the Xine dvdnav plug-in.
-
-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
-libdvdnavはDVDビデオディスクを読み取るためのシンプルなライブラリを
-提供しています。
-そのコードは Ogle をベースにしていて、他の間で、xine dvdnav プラグインで、
-使用されています。
-
-このパッケージをインストールすると、自動的にソースコードを
-ダウンロードしてコンパイルし、%{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}
-
-%clean
-%{__rm} -rf ${RPM_BUILD_ROOT}
-
-%posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
-	http://www{1,2,3,4,5,7,8}.mplayerhq.hu/%{source0path} 15000
-/usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
-                                 %{pkgname}-devel-%{version}-%{release}
-
-%files
-%defattr(-,root,root)
-%{_datadir}/%{name}/*
-
-%changelog
-* Sun Mar 21 2010 Munehiro Yamamoto <munepi@vinelinux.org> 4.1.3-5
-- renamed %%{Source0} to libdvdnav-vl.spec
-
-* Tue May 26 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 4.1.3-4
-- added BuildArch: noarch
-- avoided to execute self-build-rpm.sh on RPM transaction
-  - moved %%post actions to %%posttrans
-
-* Sat Jan 24 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 4.1.3-3
-- added BuildRequires: doxygen
-
-* Sat Dec 27 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 4.1.3-2
-- added PreReq: libdvdread-devel >= 4.1.3-1
-
-* Sun Nov 02 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 4.1.3-1
-- initial bulid based on Fedora package

+ 0 - 131
nonfree/self-build-libmp4v2/libmp4v2-vl.spec

@@ -1,131 +0,0 @@
-%define projname mp4v2
-
-Summary: Library for working with files using the mp4 container format
-Name: libmp4v2
-Version: 1.9.1
-Release: 4%{?_dist_release}
-License: MPLv1.1
-Group: System Environment/Libraries
-#URL: http://resare.com/libmp4v2/
-# Source0: http://resare.com/libmp4v2/dist/libmp4v2-%{version}.tar.bz2
-# # Only here to be in the source package, "just in case, and FYI"
-# Source1: http://resare.com/libmp4v2/mklibmp4v2/mklibmp4v2-r51.tar.bz2
-URL: http://code.google.com/p/mp4v2/
-Source0: http://mp4v2.googlecode.com/files/%{projname}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-%description
-The libmp4v2 library provides an abstraction layer for working with files
-using the mp4 container format. This library is developed by mpeg4ip project
-and is an exact copy of the library distributed in the mpeg4ip package.
-
-
-%package devel
-Summary: Development files for the mp4v2 library
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Development files and documentation needed to develop and compile programs
-using the libmp4v2 library.
-
-
-%prep
-%setup -q -n %{projname}-%{version}
-
-
-%build
-%configure \
-    --disable-static \
-    --disable-dependency-tracking \
-    --disable-gch \
-    ;
-%{__make} %{?_smp_mflags}
-
-
-%install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-
-# remove unpackaged files
-%{__rm} -rf %{buildroot}%{_mandir}/manm/
-%{__rm} -f %{buildroot}%{_libdir}/*.{a,la}
-
-%clean
-%{__rm} -rf %{buildroot}
-
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
-%files
-%defattr(-,root,root)
-%doc COPYING
-%{_bindir}/*
-%{_libdir}/*.so.*
-
-%files devel
-%defattr(-,root,root)
-%doc README
-%dir %{_includedir}/%{projname}
-%{_includedir}/%{projname}/*.h
-%{_libdir}/*.so
-%{_mandir}/man?/*
-
-
-%changelog
-* Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.1-4
-- change release to sync with self-build-libmp4v2
-
-* Thu Mar 04 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.1-3
-- fixed the permission of /usr/include/mp4v2 to access it by group, others
-
-* Sat Feb 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.1-2
-- added --disable-gch in configure options
-
-* Thu Feb 18 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.1-1
-- new upstream release 
-- changed URL: to http://code.google.com/p/mp4v2/
-  MP4v2 was originally bundled with mpeg4ip library, 
-  but has been moved into its own maintained library 
-  due to a combination of the cessation of support of mpeg4ip 
-  and the usefulness of this library on its own.
-
-* Tue May 26 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 1.5.0.1-2
-- change release to sync with self-build-libmp4v2
-
-* Sun Jan 11 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 1.5.0.1-1
-- initial build
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.5.0.1-6
-- Autorebuild for GCC 4.3
-
-* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.5.0.1-5
-- Rebuild for new BuildID feature.
-
-* Sun Aug  5 2007 Matthias Saou <http://freshrpms.net/> 1.5.0.1-4
-- Update License field.
-
-* Fri Dec 15 2006 Matthias Saou <http://freshrpms.net/> 1.5.0.1-3
-- Spec file cleanup (habits, mostly) preparing to submit for Extras inclusion.
-
-* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.5.0.1-2
-- rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Tue Jul 18 2006 Noa Resare <noa@resare.com> 1.5.0.1-1
-- new upstream release
-
-* Sat May 13 2006 Noa Resare <noa@resare.com> 1.4.1-3
-- disabled static lib
-- use DESTDIR
-- disable-dependency-tracking for faster builds
-- removed a manpage template file apt.mpt.gz
-
-* Mon May 08 2006 Noa Resare <noa@resare.com> 1.4.1-2
-- specfile cleanups
-
-* Fri May 05 2006 Noa Resare <noa@resare.com> 1.4.1-1.lvn5
-- initial release
-

+ 0 - 141
nonfree/self-build-libmp4v2/self-build-libmp4v2-vl.spec

@@ -1,141 +0,0 @@
-%define projname mp4v2
-
-%define pkgname libmp4v2
-%define name	self-build-%{pkgname}
-%define version 1.9.1
-%define release	4%{?_dist_release}
-
-#% define sourceurl0	http://resare.com/libmp4v2/dist/%{pkgname}-%{version}.tar.bz2
-#% define sourceurl1	http://resare.com/libmp4v2/mklibmp4v2/mklibmp4v2-r51.tar.bz2
-%define sourceurl0	http://mp4v2.googlecode.com/files/%{projname}-%{version}.tar.bz2
-
-Summary:	Package to automatically build %{pkgname} rpm package (with internal libmp4v2)
-Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
-Source0:	%{pkgname}-vl.spec
-
-License:	MPLv1.1
-Group:		Restricted Software
-
-Requires(post):		self-build-setup >= 0.9.9
-
-# (build)requies of target package.
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-Packager:	munepi
-
-%description
-The libmp4v2 library provides an abstraction layer for working with files
-using the mp4 container format. This library is developed by mpeg4ip project
-and is an exact copy of the library distributed in the mpeg4ip package.
-
-
-If you install this package, it automatically downloads 
-source code, compile it with internal libmp4v2, and create
-rpm packages of %{pkgname}-%{version} and libmp4v2-%{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
-libmp4v2 ライブラリは mp4 コンテナフォーマットを用いたファイ
-ルで動作するものに対して抽象レイヤーを提供します.このライブ
-ラリは mpeg4ip プロジェクトにより開発されており,mpeg4ip パッ
-ケージに分散されているライブラリの完全なコピーです.
-
-このパッケージをインストールすると、自動的にソースコードを
-ダウンロードして、%{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}
-
-%clean
-%{__rm} -rf ${RPM_BUILD_ROOT}
-
-%posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 75000
-/usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
-                                 %{pkgname}-devel-%{version}-%{release}
-
-%files
-%defattr(-,root,root)
-%{_datadir}/%{name}
-
-%changelog
-* Sat Mar 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.1-4
-- - renamed %%{Source0} to libmp4v2-vl.spec
-
-* Thu Mar 04 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.1-3
-- fixed the permission of /usr/include/mp4v2 to access it by group, others
-
-* Sat Feb 20 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.1-2
-- added --disable-gch in configure options
-
-* Thu Feb 18 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.1-1
-- new upstream release 
-- changed URL: to http://code.google.com/p/mp4v2/
-  MP4v2 was originally bundled with mpeg4ip library, 
-  but has been moved into its own maintained library 
-  due to a combination of the cessation of support of mpeg4ip 
-  and the usefulness of this library on its own.
-
-* Tue May 26 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 1.5.0.1-2
-- added BuildArch: noarch
-- avoided to execute self-build-rpm.sh on RPM transaction
-  - moved %%post actions to %%posttrans
-
-* Sun Jan 11 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 1.5.0.1-1
-- initial build
-
-### end of file

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

@@ -1,6 +1,6 @@
 Name:            libquicktime
-Version:         1.2.3
-Release:         2%{?_dist_release}
+Version:         1.2.4
+Release:         1%{?_dist_release}
 License:         LGPLv2+
 Group:           System Environment/Libraries
 Source0:         http://prdownloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
@@ -96,20 +96,15 @@ This package contains development files for %{name}.
 
 %build
 %configure \
-    --disable-static \
-    --disable-dependency-tracking \
+    --enable-gpl \
     --disable-rpath \
     --with-cpuflags="$RPM_OPT_FLAGS" \
+    --disable-dependency-tracking \
     --without-doxygen \
+    --disable-static \
     --with-libdv \
-    --enable-gpl \
     --enable-libswscale \
-    %ifarch %{ix86} x86_64
-	--enable-mmx \
-    %else
-	--disable-mmx \
-    %endif
-	;
+    ;
 
 # remove rpath from libtool
 %__sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -165,6 +160,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec %__rm -f {} \;
 
 
 %changelog
+* Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.4-1
+- new upstream release
+
 * Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.3-2
 - rebuilt with new x264 (ABI 0.119) and ffmpeg (0.9.x)
 

+ 6 - 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.3
-%define release	2%{?_dist_release}
+%define version 1.2.4
+%define release	1%{?_dist_release}
 
 %define sourceurl0	http://prdownloads.sourceforge.net/libquicktime/%{pkgname}-%{version}.tar.gz
 
@@ -137,7 +137,7 @@ libquicktime は quicktime4linux と互換性を持ったソースです。
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 188000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 197000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-utils-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
@@ -147,6 +147,9 @@ libquicktime は quicktime4linux と互換性を持ったソースです。
 %{_datadir}/%{name}
 
 %changelog
+* Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.4-1
+- new upstream release
+
 * Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.3-2
 - rebuilt with new x264 (ABI 0.119) and ffmpeg (0.9.x)
 

+ 0 - 70
nonfree/self-build-mplayer/mplayer-config-20100709-vine.patch

@@ -1,70 +0,0 @@
-diff -up mplayer-export-20100709/etc/example.conf.config mplayer-export-20100709/etc/example.conf
---- mplayer-export-20100709/etc/example.conf.config	2010-07-10 10:26:10.000000000 +0900
-+++ mplayer-export-20100709/etc/example.conf	2010-07-25 01:23:10.910312823 +0900
-@@ -1,7 +1,7 @@
- #
- # MPlayer configuration file
- #
--# Configuration files are read system-wide from /usr/local/etc/mplayer.conf
-+# Configuration files are read system-wide from /etc/mplayer/mplayer.conf
- # and per user from ~/.mplayer/config, where per-user settings override
- # system-wide settings, all of which are overrriden by the command line.
- #
-@@ -75,7 +75,7 @@
- ##################
- 
- # Specify default audio driver (see -ao help for a list).
--#ao=oss
-+ao = pulse,alsa,
- 
- # Use SDL audio driver with the esd subdriver by default.
- #ao = sdl:esd
-@@ -106,7 +106,7 @@
- #framedrop = yes
- 
- # Specify your preferred skin here (skins are searched for in
--# /usr/local/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>).
-+# /usr/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>).
- #skin = Abyss
- 
- # Resample the font alphamap.
-@@ -116,6 +116,15 @@
- # 10    bold black outline
- #ffactor = 0.75
- 
-+# FriBidi can do "funny" things to some ISO-8859-* subtitles
-+#flip-hebrew = no
-+
-+# Use fontconfig for font selection
-+fontconfig = yes
-+
-+# Default font for unstyled subtitles
-+font = "Sans"
-+
- # cache settings
- #
- # Use 8MB input cache by default.
-@@ -127,11 +136,17 @@
- # Prefill 50% of the cache before restarting playback after the cache emptied.
- #cache-seek-min = 50
- 
--# DVD: Display English subtitles if available.
--#slang = en
-+# DVD: Display Japanese subtitles if available.
-+slang = Japanese,jpn,ja
-+
-+# DVD: Play Japanese audio tracks if available.
-+alang = Japanese,jpn,ja
-+
-+# A plugged in joystick can interfere with keyboard shortcuts
-+joystick = no
- 
--# DVD: Play English audio tracks if available.
--#alang = en
-+# Inhibit (a XScrnSaver compatible) screensaver while playing a movie
-+stop-xscreensaver = yes
- 
- ###################
- # DVDNAV Settings #
-
-Diff finished.  Sun Jul 25 01:23:54 2010

+ 0 - 59
nonfree/self-build-mplayer/mplayer-config.patch

@@ -1,59 +0,0 @@
-diff -up mplayer-export-2009-10-29/etc/example.conf.config mplayer-export-2009-10-29/etc/example.conf
---- mplayer-export-2009-10-29/etc/example.conf.config	2008-02-08 19:33:39.000000000 +0100
-+++ mplayer-export-2009-10-29/etc/example.conf	2009-10-29 23:54:30.000000000 +0100
-@@ -1,7 +1,7 @@
- #
- # MPlayer configuration file
- #
--# Configuration files are read system-wide from /usr/local/etc/mplayer.conf
-+# Configuration files are read system-wide from /etc/mplayer/mplayer.conf
- # and per user from ~/.mplayer/config, where per-user settings override
- # system-wide settings, all of which are overrriden by the command line.
- #
-@@ -71,7 +71,7 @@
- ##################
- 
- # Specify default audio driver (see -ao help for a list).
--#ao=oss
-+ao = pulse,alsa,
- 
- # Use SDL audio driver with the esd subdriver by default.
- #ao = sdl:esd
-@@ -95,7 +95,7 @@
- #framedrop = yes
- 
- # Specify your preferred skin here (skins are searched for in
--# /usr/local/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>).
-+# /usr/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>).
- #skin = Abyss
- 
- # Resample the font alphamap.
-@@ -105,6 +105,15 @@
- # 10    bold black outline
- #ffactor = 0.75
- 
-+# FriBidi can do "funny" things to some ISO-8859-* subtitles
-+flip-hebrew = no
-+
-+# Use fontconfig for font selection
-+fontconfig = yes
-+
-+# Default font for unstyled subtitles
-+font = "Sans"
-+
- # cache settings
- #
- # Use 8MB input cache by default.
-@@ -122,6 +131,12 @@
- # DVD: Play English audio tracks if available.
- #alang = en
- 
-+# A plugged in joystick can interfere with keyboard shortcuts
-+joystick = no
-+
-+# Inhibit (a XScrnSaver compatible) screensaver while playing a movie
-+stop-xscreensaver = yes
-+
- ###################
- # DVDNAV Settings #
- ###################

+ 0 - 31
nonfree/self-build-mplayer/mplayer-manlinks.patch

@@ -1,31 +0,0 @@
-diff -up mplayer-export-2009-10-29/Makefile.manlinks mplayer-export-2009-10-29/Makefile
---- mplayer-export-2009-10-29/Makefile.manlinks	2009-10-19 11:56:18.000000000 +0200
-+++ mplayer-export-2009-10-29/Makefile	2009-10-30 00:42:36.000000000 +0100
-@@ -922,10 +922,10 @@ install-mencoder-man: $(foreach lang,$(M
- install-mplayer-man:  $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
- 
- install-gui-man-en: install-mplayer-man-en
--	cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
-+	echo ".so mplayer.1" > $(MANDIR)/man1/gmplayer.1
- 
- install-mencoder-man-en: install-mplayer-man-en
--	cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
-+	echo ".so mplayer.1" > $(MANDIR)/man1/mencoder.1
- 
- install-mplayer-man-en:
- 	$(INSTALL) -d $(MANDIR)/man1
-@@ -933,12 +933,12 @@ install-mplayer-man-en:
- 
- define GUI_MAN_RULE
- install-gui-man-$(lang): install-mplayer-man-$(lang)
--	cd $(MANDIR)/$(lang)/man1/ && ln -sf mplayer.1 gmplayer.1
-+	echo ".so mplayer.1" > $(MANDIR)/$(lang)/man1/gmplayer.1
- endef
- 
- define MENCODER_MAN_RULE
- install-mencoder-man-$(lang): install-mplayer-man-$(lang)
--	cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1
-+	echo ".so mplayer.1" > $(MANDIR)/$(lang)/man1/mencoder.1
- endef
- 
- define MPLAYER_MAN_RULE

+ 0 - 43
nonfree/self-build-mplayer/mplayer-nodvdcss.patch

@@ -1,43 +0,0 @@
-diff -up mplayer-export-2010-07-03/configure.nodvdcss mplayer-export-2010-07-03/configure
---- mplayer-export-2010-07-03/configure.nodvdcss	2010-07-02 18:52:32.000000000 +0200
-+++ mplayer-export-2010-07-03/configure	2010-07-03 18:00:01.000000000 +0200
-@@ -677,7 +677,7 @@ _dvdnavconfig=dvdnav-config
- _dvdreadconfig=dvdread-config
- _dvdread=auto
- _dvdread_internal=auto
--_libdvdcss_internal=auto
-+_libdvdcss_internal=no
- _xanim=auto
- _real=auto
- _live=auto
-diff -up mplayer-export-2010-07-03/Makefile.nodvdcss mplayer-export-2010-07-03/Makefile
---- mplayer-export-2010-07-03/Makefile.nodvdcss	2010-07-03 18:00:01.000000000 +0200
-+++ mplayer-export-2010-07-03/Makefile	2010-07-03 18:00:26.000000000 +0200
-@@ -146,11 +146,6 @@ SRCS_COMMON-$(LIBDCA)                += 
- SRCS_COMMON-$(LIBDV)                 += libmpcodecs/ad_libdv.c \
-                                         libmpcodecs/vd_libdv.c \
-                                         libmpdemux/demux_rawdv.c
--SRCS_COMMON-$(LIBDVDCSS_INTERNAL)    += libdvdcss/css.c \
--                                        libdvdcss/device.c \
--                                        libdvdcss/error.c \
--                                        libdvdcss/ioctl.c \
--                                        libdvdcss/libdvdcss.c \
- 
- SRCS_COMMON-$(LIBMAD)                += libmpcodecs/ad_libmad.c
- 
-@@ -764,7 +759,6 @@ DIRS =  . \
-         libavutil/sh4 \
-         libavutil/tomi \
-         libavutil/x86 \
--        libdvdcss \
-         libdvdnav \
-         libdvdnav/vm \
-         libdvdread4 \
-@@ -887,7 +881,6 @@ $(call ADDSUFFIXES,.d .o,mpcommon osdep/
- 
- gui/%: CFLAGS += -Wno-strict-prototypes
- 
--libdvdcss/%:   CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)
- libdvdnav/%:   CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS)
- libdvdread4/%: CFLAGS := -Ilibdvdread4 -D__USE_UNIX98 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS)
- libfaad2/%:    CFLAGS := -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS)

+ 0 - 37
nonfree/self-build-mplayer/mplayer-snapshot-vine.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-set -e
-
-tmp=$(mktemp -d)
-
-trap cleanup EXIT
-cleanup() {
-    set +e
-    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
-}
-
-unset CDPATH
-pwd=$(pwd)
-#svn=$(date +%Y-%m-%d)
-svn=2010-07-02
-#dirname=mplayer-export-$svn
-dirname=mplayer-export-`echo $svn | sed s/-//g`
-mplayer_rev={$svn}
-
-cd "$tmp"
-svn checkout -r ${mplayer_rev} svn://svn.mplayerhq.hu/mplayer/trunk $dirname
-cd $dirname
-
-rm -rf libdvdcss
-for dir in libav* libdvd* libpostproc ; do
-	cd $dir
-	svn update -r ${mplayer_rev}
-	cd ..
-done
-
-svn_revision=`LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
-sed -i -e 's/\(SVN-r[0-9]* \)/\1vine /' -e "s/UNKNOWN/SVN-r$svn_revision/" version.sh
-find . -type d -name .svn -print0 | xargs -0r rm -rf
-cd ..
-tar jcf "$pwd"/$dirname.tar.bz2 $dirname
-cd - >/dev/null

+ 44 - 49
nonfree/self-build-mplayer/mplayer-vl.spec

@@ -2,15 +2,17 @@
 %global with_vaapi 1
 %global with_libvpx 1
 
-# define with_ffmpeg 1
+#% define with_ffmpeg 1
 
 %global name	mplayer
 %global version	1.0
-# define extver	rc4
-%global svndate  20111210
-%global release	45%{?extver:.%extver}%{?svndate:.%svndate}%{?_dist_release}
+#% define extver	rc4
+%global svndate  20120525
+%global release	47%{?extver:.%extver}%{?svndate:.%svndate}%{?_dist_release}
 
-# define dvbappver 0.95
+#% define dvbappver 0.98
+
+%define codecdir   %{_libdir}/codecs
 
 %global ttfontdir   /usr/share/fonts
 %global ttfontlist  TrueType-vlgothic/VL-PGothic-Regular \\\
@@ -26,29 +28,28 @@ Source0:	mplayer-export-%{svndate}.tar.xz
 Source1:	http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2
 Source10:       mplayer-snapshot-vine.sh
 
-## DVB app.
-## 0.9.5
-# Source100: http://2sen.dip.jp/cgi-bin/dtvup/source/up0624.zip
-## 0.9.5 -> 0.9.6
-# Source101: http://2sen.dip.jp/cgi-bin/dtvup/source/up0658.zip
+# ## DVB app.
+# ## 0.9.8
+# Source100: http://2sen.dip.jp/cgi-bin/dtvup/source/up0799.zip
 
+# set defaults for Vine Linux
 #Patch2:         %{name}-config.patch
-Patch2:         %{name}-config-20111217-vine.patch
+Patch2:         %{name}-config-20120525-vine.patch
+# use roff include statements instead of symlinks
 Patch8:         %{name}-manlinks.patch
+# erase any trace of libdvdcss
 Patch14:        %{name}-nodvdcss.patch
+# use system FFmpeg libraries
 Patch18:        %{name}-ffmpeg.patch
 
 ## Vine
-# Patch50:       mplayer-20100709-fixed-vo_x11_create_vo_window.patch
-# Patch101:      mplayer-1.0rc4-0001-makes-ffdec_aac-more-robust-against-erroneous-irregu.patch
-# Patch102:      mplayer-1.0rc4-0002-add-support-for-audio-channel-reconfiguration.patch
-# Patch103:      mplayer-1.0rc4-0003-add-support-for-dual-mono-auto-selection-and-switchi.patch
-# Patch106:      mplayer-1.0rc4-0006-add-support-for-S2API-tuning-with-a-new-channels.con.patch
-# Patch107:      mplayer-1.0rc4-0007-add-BCAS-descrambling-feature.patch
-# Patch111:      mplayer-1.0rc4-ffmpeg-0001-makes-ffdec_aac-more-robust-against-erroneous-irregu.patch
-# Patch113:      mplayer-1.0rc4-ffmpeg-0003-add-dual-mono-support-to-ffdec_aac.patch
-
-License:	GPLv2+
+
+
+%if 0%{!?_without_amr:1}
+License:        GPLv3+
+%else
+License:        GPLv2+
+%endif
 Group:		Applications/Multimedia
 URL:		http://www.mplayerhq.hu/
 
@@ -57,11 +58,12 @@ BuildRequires:  aalib-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	cdparanoia-devel
 BuildRequires:  desktop-file-utils
+##!!BuildRequires:  em8300-devel
 BuildRequires:  libdvdnav-devel
 BuildRequires:  enca-devel
+BuildRequires:  fontconfig-devel
 BuildRequires:	freetype2-devel >= 2.0.9
 BuildRequires:  fribidi-devel
-BuildRequires:  fontconfig-devel
 BuildRequires:	giflib-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	mesa-libGL-devel
@@ -78,14 +80,10 @@ BuildRequires:	libdvdread
 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.6}
-%endif
 BuildRequires:  lzo-devel >= 2
 BuildRequires:  pulseaudio-lib-devel
 BuildRequires:  speex-devel >= 1.1
@@ -110,6 +108,7 @@ Requires:	mesa-libGL
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
+Obsoletes:      mplayer < %{version}-%{release}
 
 %description
 MPlayer can play most standard video formats out of the box and almost
@@ -159,23 +158,8 @@ MPlayer は何もしなくても DVD や MPEG-1/2/4 のように一般的なフ
 
 # ## apply the DVB app. patches
 # unzip %{SOURCE100}
-# cat>ffmpeg<<EOF
-# Subproject commit 4f84e728dad84a366a2d183da03b7d92cb20fb23
-# EOF
-# %patch101 -p1 -b .vine
-# %patch102 -p1 -b .vine
-# %patch103 -p1 -b .vine
-# patch -p1 < mplayer-patches-%{dvbappver}/0004-improved-stream-selection-by-limiting-the-switch-wit.patch || exit 1
-# patch -p1 < mplayer-patches-%{dvbappver}/0005-extended-DVB-options-to-support-more-cards-and-speci.patch || exit 1
-# %patch106 -p1 -b .vine
-# %patch107 -p1 -b .vine
-# patch -p1 < mplayer-patches-%{dvbappver}/0008-supports-PMT-contents-change.patch || exit 1
-# patch -p1 < mplayer-patches-%{dvbappver}/0009-supports-video-frame-size-change.patch || exit 1
-
-# %patch111 -p1 -b .vine
-# patch -p1 < mplayer-patches-%{dvbappver}/ffmpeg/0002-add-support-for-audio-channel-reconfiguration.patch || exit 1
-# %patch113 -p1 -b .vine
-# patch -p1 < mplayer-patches-%{dvbappver}/ffmpeg/0004-fixed-sample-rate-calculation-in-SBR-AAC-HE_AAC.patch || exit 1
+# patch -p1 < mplayer-patches-%{dvbappver}/0014-check-the-decoded-result-of-PCE.patch || exit 1
+
 
 %build
 ./configure \
@@ -185,6 +169,7 @@ MPlayer は何もしなくても DVD や MPEG-1/2/4 のように一般的なフ
     --mandir=%{_mandir} \
     --confdir=%{_sysconfdir}/mplayer \
     --libdir=%{_libdir} \
+    --codecsdir=%{codecdir} \
     \
     --extra-cflags="$RPM_OPT_FLAGS" \
     --language=ja,en \
@@ -192,6 +177,7 @@ MPlayer は何もしなくても DVD や MPEG-1/2/4 のように一般的なフ
     --enable-gui --enable-menu \
     --enable-radio --enable-radio-capture \
     --enable-runtime-cpudetection \
+    --enable-unrarexec \
     \
     --disable-dvdread-internal \
     --disable-libdvdcss-internal \
@@ -212,6 +198,7 @@ MPlayer は何もしなくても DVD や MPEG-1/2/4 のように一般的なフ
     --with-xvmclib=XvMCW \
     \
     --disable-arts --disable-esd --disable-jack --disable-openal \
+    --disable-live \
     ;
 
 %{__make} V=1 %{?_smp_mflags}
@@ -234,10 +221,12 @@ MPlayer は何もしなくても DVD や MPEG-1/2/4 のように一般的なフ
 %{__install} -pm 644 etc/{input,menu,codecs}.conf \
     ${RPM_BUILD_ROOT}%{_sysconfdir}/mplayer
 
-# Icons
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-%__mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/mplayer.png \
-    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+# # Icons
+# for iconsize in 16x16 22x22 24x24 32x32 48x48 256x256; do
+#     install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$iconsize/apps
+#     install -pm 644 etc/mplayer$iconsize.png \
+#         $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$iconsize/apps/mplayer.png
+# done
 
 # install default skin
 %{__mkdir} -p ${RPM_BUILD_ROOT}%{_datadir}/mplayer/skins
@@ -303,7 +292,7 @@ fi || :
 %{_datadir}/mplayer/skins/default
 %{_datadir}/mplayer/subfont.ttf
 %{_datadir}/applications/mplayer.desktop
-%{_datadir}/icons/hicolor/48x48/apps/mplayer.png
+%{_datadir}/icons/hicolor/*/apps/mplayer.png
 %{_mandir}/man1/mplayer.1*
 %{_mandir}/man1/mencoder.1*
 ## TOOLS
@@ -322,7 +311,13 @@ fi || :
 
 
 %changelog
-* Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-45.20111217
+* Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-47.20120525
+- updated snapshot 20120525 with ffmpeg 0.11
+
+* Tue Jan  3 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-46.20120102
+- updated snapshot 20120102
+
+* Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-45.20111210
 - updated snapshot 20111217 (with ffmpeg 0.9)
 
 * Wed Nov  2 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-44.rc4

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

@@ -8,8 +8,8 @@
 %global name	self-build-%{pkgname}
 %global version 1.0
 #% global extver	rc4
-%global svndate  20111210
-%global release	45%{?extver:.%extver}%{?svndate:.%svndate}%{?_dist_release}
+%global svndate  20120525
+%global release	47%{?extver:.%extver}%{?svndate:.%svndate}%{?_dist_release}
 
 %global source0path	MPlayer/releases/MPlayer-%{version}%{extver}.tar.bz2
 %global source1path	MPlayer/skins/Blue-1.8.tar.bz2
@@ -23,16 +23,17 @@ Source0:	%{pkgname}-vl.spec
 Source10:	%{pkgname}-snapshot-vine.sh
 
 #Source102:        %{pkgname}-config.patch
-Source102:        %{pkgname}-config-20111217-vine.patch
+Source102:        %{pkgname}-config-20120525-vine.patch
 Source108:        %{pkgname}-manlinks.patch
 Source114:        %{pkgname}-nodvdcss.patch
 Source118:        %{pkgname}-ffmpeg.patch
 
-Source150:       mplayer-20100709-fixed-vo_x11_create_vo_window.patch
-
 License:	GPLv2+
 Group:		Restricted Software
 
+Obsoletes:      mplayer < %{version}-%{release}
+Obsoletes:      self-build-mplayer < %{version}-%{release}
+
 Requires(post):		self-build-setup >= 0.9.9
 Requires(post):		subversion
 
@@ -63,14 +64,10 @@ Requires(post):	libdvdread
 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.6}
-%endif
 Requires(post):  lzo-devel >= 2
 Requires(post):  pulseaudio-lib-devel
 Requires(post):  speex-devel >= 1.1
@@ -80,17 +77,13 @@ Requires(post):  yasm
 Requires(post):	zlib-devel
 
 Requires(post):		self-build-mplayer-codecs
-Requires(post):		self-build-libdvdcss
+##!!Requires(post):		self-build-libdvdcss
 Requires(post):		self-build-faac
 Requires(post):		self-build-faad2 >= 2.6.1
 Requires(post):		self-build-lame
 Requires(post):		self-build-libdca
 Requires(post):		self-build-libmad
-%if %{?_dist_release} != "vl5"
-Requires(post):	self-build-x264 >= 0.0.0-18.20111216
-%elseif %{?_dist_release} == "vl5"
-Requires(post):	self-build-x264 >= 0.0.0-9.20090522
-%endif
+Requires(post):	self-build-x264 >= 0.120
 Requires(post):		self-build-xvidcore >= 0.9.2
 Requires(post):		self-build-libmpeg2
 Requires:	TrueType-vlgothic
@@ -242,14 +235,18 @@ su $BUILD_USER -c "/bin/bash %{_datadir}/%{name}/%{pkgname}-snapshot-vine.sh >/d
 )
 
 /usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
-    http://www{,1,2,3,4,5,7,8,9}.mplayerhq.hu/%{source1path} \
-    635000
+    http://www{,1,2,3,4,5,7,8,9}.mplayerhq.hu/%{source1path} 1368000
+    
 
 %files
 %defattr(-,root,root)
 %{_datadir}/%{name}
 
 %changelog
+* Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-47.20120525
+- updated snapshot 20120525 with ffmpeg 0.11
+- dropped Requires(post): self-build-libdvdcss
+
 * Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-45.20111217
 - updated snapshot 20111217 (with ffmpeg 0.9)
 

+ 18 - 44
nonfree/self-build-vlc/self-build-vlc-vl.spec

@@ -1,14 +1,13 @@
 %define pkgname vlc
 %define name    self-build-%{pkgname}
-%define version 1.1.13
+%define version 2.0.1
 %define release 1%{?_dist_release}
 
 %define with_mozilla	 		0
-%define with_dc1394			0
 
-%define with_samba			0
+#% define with_dc1394			1
 
-%define sourceurl0	http://download.videolan.org/pub/videolan/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.bz2
+%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
 
 
@@ -18,19 +17,14 @@ Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
 
-Obsoletes:	vlc < 1.1.0
-Obsoletes:	vlc-devel < 1.1.0
+Obsoletes:	self-build-vlc < %{version}-%{release}
+Obsoletes:	vlc < %{version}, vlc-devel < %{version}
 
 Source0:	%{pkgname}-vl.spec
 
-Source100:      vlc-1.1.0-vlc-cache-gen_noerror.patch
-Source103:	vlc-1.1.6-hardode_font_patch.patch
-Source104:	vlc-1.1.4-tls_path.patch
+Source100:      vlc-2.0.1-fftype.patch
 #Source105:         vlc-1.1.8-bugfix.opencv22.patch
 
-## vine
-Source150:	vlc-1.1.7-revert-pulse-c.patch
-
 License:	GPLv2+
 Group:		Restricted Software
 
@@ -55,15 +49,15 @@ Requires(post):	fribidi-devel
 Requires(post):  gnome-vfs2-devel
 Requires(post):	gnutls-devel >= 1.0.17
 Requires(post):	gsm-devel
-Requires(post):	hal-devel
 Requires(post):	jack-audio-connection-kit-devel
-Requires(post):  libavc1394-devel
+%{?with_dc1394:Requires(post):  libavc1394-devel}
 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
+%{?with_dc1394:Requires(post):	libavc1394-devel >= 0.5.3}
+%{?with_dc1394:Requires(post):	libdc1394-devel >= 2.1.0}
+%{?with_dc1394:Requires(post):	libdv-devel}
 Requires(post):	libdvdnav-devel
 Requires(post):	libdvdread-devel
 Requires(post):  libebml-devel
@@ -79,9 +73,7 @@ Requires(post):  libnotify-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
@@ -89,14 +81,10 @@ Requires(post):  libsmbclient-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"
 Requires(post):	libva-devel
-%endif
 Requires(post):	libvorbis-devel
 Requires(post):  libxml2-devel
 #Requires(post):	lirc-devel
@@ -121,9 +109,7 @@ Requires(post):	SDL_image-devel
 Requires(post):	speex-devel >= 1.1.5
 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
@@ -136,15 +122,9 @@ Requires(post):  libX11-devel
 Requires(post):  libXext-devel
 Requires(post):  libXpm-devel
 Requires(post):  libXvMC-devel
-%if %{?_dist_release} != "vl5"
 Requires(post):  xcb-util-devel
-%endif
 Requires(post):  xorg-x11-proto-devel
 
-%if %with_samba
-Requires(post):  samba-libsmbclient-devel
-%endif
-
 Requires(post):  pulseaudio-libs-devel >= 0.9.8
 
 %if %with_mozilla
@@ -152,14 +132,12 @@ Requires(post):  gecko-devel
 Requires(post):  nspr-devel
 %endif
 
-Requires(post):  libraw1394-devel
-
 Requires: TrueType-dejavu
 
 ## vine
 Requires(post):	libgcrypt-devel
 Requires(post):	wx-gtk2-devel
-Requires:	mesa-libGL
+Requires(post):	mesa-libGL
 Requires(post):	xorg-x11-devel 
 Requires(post):	mesa-libGL-devel
 Requires(post):	self-build-libmpeg2
@@ -170,11 +148,7 @@ Requires(post):	self-build-ffmpeg >= 0.4.9
 Requires(post):	self-build-libdca
 Requires(post):	self-build-libdvbpsi
 Requires(post):	self-build-libmad
-%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-x264 >= 0.120
 Requires(post):	self-build-xvidcore
 
 BuildArch:	noarch
@@ -252,11 +226,7 @@ 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} %{SOURCE103} %{SOURCE104} \
-    %{SOURCE150} \
-    ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+%{__install} -m 644 %{SOURCE100} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 
 %clean
@@ -264,7 +234,7 @@ mp3, ogg など)だけでなく,DVD や VCD,様々なストリーミング
 
 %posttrans
 /usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
-    %{sourceurl0} %{sourceurl10} 1286000
+    %{sourceurl0} %{sourceurl10} 1556000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
 
@@ -274,6 +244,10 @@ mp3, ogg など)だけでなく,DVD や VCD,様々なストリーミング
 
 
 %changelog
+* Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.1-1
+- new upstream release
+- dropped DC1394 and DV
+
 * Tue Jan  3 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.13-1
 - new upstream release
 

+ 25 - 111
nonfree/self-build-vlc/vlc-vl.spec

@@ -7,32 +7,23 @@
 #% define vlc_date	20080915
 #% define with_mozilla	 		1
 %define with_mozilla	 		0
-%define with_dc1394			0
 
-%define with_samba			0
+#% define with_dc1394			1
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	1.1.13
+Version:	 2.0.1
 Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org/
-Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.bz2
-# %if %with_internal_live555
-# Source2:	http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
-# %endif
+Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.xz
 
 # vlc_patch_0.02/vlc118.diff
 Source10: http://2sen.dip.jp/cgi-bin/dtvup/source/up0617.zip
 
-Patch0:		vlc-1.1.0-vlc-cache-gen_noerror.patch
-Patch3:		vlc-1.1.6-hardode_font_patch.patch
-Patch4:		vlc-1.1.4-tls_path.patch
-#Patch5:         vlc-1.1.8-bugfix.opencv22.patch
-
-## vine
-Patch50:	vlc-1.1.7-revert-pulse-c.patch
+Patch0:		vlc-2.0.1-fftype.patch
+#Patch5:		vlc-1.1.8-bugfix.opencv22.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -40,6 +31,7 @@ BuildRequires:	unzip
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 #BuildRequires:  prelink
+Buildrequires:	xz
 
 BuildRequires:	gettext-devel
 BuildRequires:	libtool
@@ -62,16 +54,16 @@ BuildRequires:	fribidi-devel
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:	gnutls-devel >= 1.0.17
 BuildRequires:	gsm-devel
-BuildRequires:	hal-devel
 BuildRequires:	jack-audio-connection-kit-devel
-BuildRequires:  libavc1394-devel
+%{?with_dc1394:BuildRequires:  libavc1394-devel >= 0.5.3}
+%{?with_dc1394:BuildRequires:  libraw1394-devel >= 2.0.1}
 BuildRequires:	libass-devel >= 0.9.7
 ##!! BuildRequires:	libcaca-devel
 BuildRequires:	libcddb-devel
 BuildRequires:	libcdio-devel >= 0.77-3
-BuildRequires:	libdc1394-devel >= 2.1.0
+%{?with_dc1394:BuildRequires:	libdc1394-devel >= 2.1.0}
 #BuildRequires:	libdca-devel
-BuildRequires:	libdv-devel
+%{?with_dc1394:BuildRequires:	libdv-devel}
 #BuildRequires:	libdvbpsi-devel
 BuildRequires:	libdvdnav-devel
 BuildRequires:	libdvdread-devel
@@ -89,9 +81,7 @@ BuildRequires:  libnotify-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
@@ -99,14 +89,10 @@ BuildRequires:  libsmbclient-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} != "vl5"
 BuildRequires:	libva-devel
-%endif
 BuildRequires:	libvorbis-devel
 BuildRequires:  libxml2-devel
 #BuildRequires:	lirc-devel
@@ -136,9 +122,7 @@ BuildRequires:	SDL_image-devel
 BuildRequires:	speex-devel >= 1.1.5
 BuildRequires:  taglib-devel
 BuildRequires:	twolame-devel
-%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
@@ -154,9 +138,7 @@ BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  libXvMC-devel
-%if %{?_dist_release} != "vl5"
 BuildRequires:  xcb-util-devel
-%endif
 BuildRequires:  xorg-x11-proto-devel
 
 %if %with_mozilla
@@ -164,22 +146,6 @@ BuildRequires:  gecko-devel
 BuildRequires:  nspr-devel
 %endif
 
-# # Now obsoleted as it will be built externally
-# Obsoletes: java-vlc < 0.9.0
-# Obsoletes: python-vlc < 0.9.0
-
-# %if 0
-# BuildRequires:  libgoom2-devel
-# BuildRequires:  libggi-devel
-# %endif
-
-# %if %with_dc1394
-# BuildRequires:  compat-libdc1394-devel
-# BuildRequires:  compat-libraw1394-devel
-# %else
-BuildRequires:  libraw1394-devel
-# %endif
-
 #Requires: dejavu-fonts
 Requires: TrueType-dejavu
 
@@ -207,13 +173,6 @@ BuildRequires:	mesa-libGL-devel
 ##BuildRequires:	self-build-x264 >= 0.0.0-15.20110322
 ##BuildRequires:	self-build-xvidcore
 
-
-%package devel
-Summary:	Development package for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-
 %description
 VLC (initially VideoLAN Client) is a highly portable multimedia player
 for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX,
@@ -221,6 +180,11 @@ mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols.
 It can also be used as a server to stream in unicast or multicast in
 IPv4 or IPv6 on a high-bandwidth network.
 
+%package devel
+Summary:	Development package for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
 %description devel
 This package contains development files for VLC Media Player.
 
@@ -248,55 +212,19 @@ It can also be used as a server to stream in unicast or multicast in
 IPv4 or IPv6 on a high-bandwidth network.
 %endif
 
-%if %with_dc1394
-%package plugins-dc1394
-Summary:	VLC Media Player Plugins for dc1394
-Group:		Applications/Multimedia
-Requires:	%{name}-core = %{version}
-Requires:       compat-libdc1394-tools
-
-%description plugins-dc1394
-VLC plugins for libdc1394
-%endif
-
 %prep
 %setup -q -n %{name}-%{version}
-# %if %with_internal_live555
-# %setup -q -D -T -a 2 -n %{name}-%{_version}
-# %endif
-%patch0 -p1 -b .noerror
-%patch3 -p1 -b .hardode_path
-%patch4 -p1 -b .tls_path
-#%patch5 -p1 -b .opencv22
-%__sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
+
+%patch0 -p1
 
 unzip %{SOURCE10}
 patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
 
-## vine
-%if %{?_dist_release} == "vl5"
-%patch50 -p1 -b .pulse
-%endif
-
-%__sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
-
-%__rm modules/access/videodev2.h
-%__ln_s -f %{_includedir}/linux/videodev2.h modules/access/videodev2.h
-
 %__rm aclocal.m4 m4/lib*.m4 m4/lt*.m4
 ./bootstrap
 
 
 %build
-# %if %with_internal_live555
-# # Then bundled live555 - not needed
-# pushd live
-# # Force the use of our CFLAGS
-# %{__perl} -pi -e 's|-O2|%{optflags} -fPIC -DPIC|g' config.linux
-# # Configure and build
-# ./genMakefiles linux && make
-# popd
-# %endif
 
 
 %configure \
@@ -306,24 +234,18 @@ patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
 	--enable-release			\
 	--with-binary-version=%{version}-%{release} \
 	--with-tuning=no			\
-	--enable-switcher			\
+	--without-kde-solid			\
+	%{?_with_ffmpeg:--enable-switcher}	\
 	--enable-lua				\
         %{?_with_internal_live555:--enable-live555 --with-live555-tree=live} \
-%if %with_dc1394
-	--enable-dc1394				\
-	--enable-dv				\
-%endif
-%if %{?_dist_release} != "vl5"
+	%{?with_dc1394:--enable-dv}		\
 	--enable-libva				\
-%endif
 	--enable-dvdread --enable-dvdnav	\
 	%{?_with_opencv:--enable-opencv} \
 	--enable-sftp				\
 	--enable-pvr				\
 	--enable-gnomevfs			\
-%if %{?_dist_release} != "vl5"
 	--enable-vcdx				\
-%endif
 	--enable-cddax				\
 	--enable-wma-fixed			\
 	--enable-shine				\
@@ -339,9 +261,7 @@ patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
 	%{?_with_dirac:--enable-dirac}		\
 	--enable-libass				\
 	--enable-shout				\
-%if %{?_dist_release} != "vl5"
 	--enable-xcb				\
-%endif
 	--enable-svg				\
 	--enable-snapshot			\
 %ifarch %{ix86} x86_64
@@ -367,16 +287,8 @@ patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
 %if %with_mozilla 
 	--enable-mozilla			\
 %endif
-	--without-kde-solid			\
 	;
 
-# remove rpath from libtool
-%__sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-%__sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-# # clean unused-direct-shlib-dependencies
-# sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
-
 %__make %{?_smp_mflags}
 
 
@@ -444,7 +356,7 @@ fi || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS
+%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README THANKS
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/*
 %{_bindir}/cvlc
@@ -462,10 +374,8 @@ fi || :
 
 %files devel
 %defattr(-,root,root,-)
-%doc HACKING
 %dir %{_includedir}/vlc
 %{_includedir}/vlc/*
-%{_mandir}/man1/vlc-config.1*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/vlc-plugin.pc
 %{_libdir}/pkgconfig/libvlc.pc
@@ -478,6 +388,10 @@ fi || :
 
 
 %changelog
+* Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.1-1
+- new upstream release
+- dropped DC1394 and DV
+
 * Tue Jan  3 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.13-1
 - new upstream release
 

+ 9 - 11
nonfree/self-build-x264/self-build-x264-vl.spec

@@ -1,11 +1,11 @@
-%global snapshot_date	20111216
+%global snapshot_date	20120525
 %global snapshot_time	2245
 %global branch		stable
 
 %global pkgname 	x264
 %global name		self-build-%{pkgname}
-%global version		0.0.0
-%global release		18.%{snapshot_date}%{?_dist_release}
+%global version		0.124
+%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
@@ -16,14 +16,11 @@ Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
-Source1:	%{pkgname}.desktop
-Source111:	%{pkgname}-shared.patch
-Source112:	%{pkgname}-nostrip.patch
 
 License:	GPLv2+
 Group:		Restricted Software
 
-Obsoletes:      x264 < %{version}-%{release}
+Obsoletes:      x264 < %{version}, x264-devel < %{version}
 Obsoletes:      self-build-x264 < %{version}-%{release}
 
 Requires(post):		self-build-setup >= 0.9.9
@@ -104,15 +101,12 @@ x264 はスクラッチから書かれた H264/AVC ビデオストリームを
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE111} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE112} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 19000
+/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}
 
@@ -121,6 +115,10 @@ x264 はスクラッチから書かれた H264/AVC ビデオストリームを
 %{_datadir}/%{name}
 
 %changelog
+* 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
+
 * Sat Dec 17 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.0-18.20111216
 - updated source snapshot 20111216 stable branch (ABI 0.119)
 

+ 12 - 17
nonfree/self-build-x264/x264-vl.spec

@@ -1,40 +1,33 @@
-%global snapshot_date	20111216
+%global snapshot_date	20120525
 %global snapshot_time	2245
 %global branch		stable
 
 Summary: Library for encoding and decoding H264/AVC video streams
 Name: x264
-Version: 0.0.0
-Release: 18.%{snapshot_date}%{?_dist_release}
+Version: 0.124
+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
-# # don't remove config.h and don't re-run version.sh
-# Patch0: x264-nover.patch
-# # link with shared libx264
-# Patch1: x264-shared.patch
-# don't strip if configured with --enable-debug
-# Patch2: x264-nostrip.patch
-BuildRequires: yasm
+BuildRequires: yasm >= 1.0.0
 # gpac-devel package provided by self-build-gpac
 # 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}
 Obsoletes:      libx264 < %{version}
-Obsoletes:      x264 < %{version}
+Obsoletes:      x264 < %{version}, x264-devel < %{version}
 
 
 %description
 x264 is a free library for encoding H264/AVC video streams, written from
 scratch.
 
+This package also contains the frontend.
+
 %package devel
 Summary: Development files for the x264 library
 Group: Development/Libraries
@@ -49,9 +42,6 @@ This package contains the development files.
 
 %prep
 %setup -q -n %{name}-snapshot-%{snapshot_date}-%{snapshot_time}%{?branch:-%{branch}}
-# %patch0 -p1 -b .nover
-# %patch1 -p1 -b .shared
-# %patch2 -p1 -b .nostrip
 
 %build
 ./configure \
@@ -68,6 +58,7 @@ This package contains the development files.
     %{!?_with_ffmpegsource:--disable-ffms} \
     --enable-debug \
     --enable-shared \
+    --system-libx264 \
     --enable-pic \
     ;
 
@@ -104,6 +95,10 @@ This package contains the development files.
 
 
 %changelog
+* 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
+
 * Sat Dec 17 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.0-18.20111216
 - updated source snapshot 20111216 stable branch (ABI 0.119)