updated to 1.1; built with ffmpeg-0.11.1; added some skins

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

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

@@ -2,45 +2,48 @@
 %global with_vaapi 1
 %global with_libvpx 1
 
-#% define with_ffmpeg 1
+#% global with_ffmpeg 1
+%global ffmpegver 0.11.1
 
-%global name	mplayer
-%global version	1.0
-#% define extver	rc4
-%global svndate  20120525
-%global release	47%{?extver:.%extver}%{?svndate:.%svndate}%{?_dist_release}
-
-#% define dvbappver 0.98
+#% global svndate  20120525
+#% global dvbappver 0.98
 
 %define codecdir   %{_libdir}/codecs
 
-%global ttfontdir   /usr/share/fonts
+%global ttfontdir   %{_datadir}/fonts
 %global ttfontlist  TrueType-vlgothic/VL-PGothic-Regular \\\
                     TrueType-sazanami-gothic/sazanami-gothic
 
 Summary:	The Movie Player
 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.xz
-Source1:	http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2
+Name:		mplayer
+Version:	1.1
+Release: 	1%{?svndate:.%svndate}%{?_dist_release}
+Source0:	http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}.tar.xz
+#Source0:	mplayer-export-%{svndate}.tar.xz
+Source1:	http://ffmpeg.org/releases/ffmpeg-%{ffmpegver}.tar.bz2
+
 Source10:       mplayer-snapshot-vine.sh
 
+Source11:	http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2
+Source12:	http://www.mplayerhq.hu/MPlayer/skins/Blue-small-1.5.tar.bz2
+Source13:	http://www.mplayerhq.hu/MPlayer/skins/standard-1.9.tar.bz2
+Source14:	http://www.mplayerhq.hu/MPlayer/skins/OSX-Mod-1.1.tar.bz2
+
 # ## 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-20120525-vine.patch
+#Patch2:         %{name}-config-20120525-vine.patch
+Patch2:         %{name}-1.1-config-vine.patch
 # use roff include statements instead of symlinks
-Patch8:         %{name}-manlinks.patch
+Patch8:         %{name}-1.1-manlinks.patch
 # erase any trace of libdvdcss
-Patch14:        %{name}-nodvdcss.patch
+Patch14:        %{name}-1.1-nodvdcss.patch
 # use system FFmpeg libraries
-Patch18:        %{name}-ffmpeg.patch
+Patch18:        %{name}-1.1-ffmpeg.patch
 
 ## Vine
 
@@ -148,8 +151,9 @@ MPlayer は何もしなくても DVD や MPEG-1/2/4 のように一般的なフ
 
 
 %prep
-#%setup -q -n MPlayer-%{version}%{extver}
-%setup -q -n mplayer-export-%{svndate}
+#% setup -q -n mplayer-export-%{svndate}
+%setup -q -n MPlayer-%{version}
+%__rm -rf ffmpeg && %__tar xf %{SOURCE1} && mv ffmpeg-%{ffmpegver} ffmpeg || exit 1
 
 %patch2 -p1 -b .vine
 %patch8 -p1 -b .manlinks
@@ -228,11 +232,13 @@ MPlayer は何もしなくても DVD や MPEG-1/2/4 のように一般的なフ
 #         $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$iconsize/apps/mplayer.png
 # done
 
-# install default skin
+# install skins and set the default skin
 %{__mkdir} -p ${RPM_BUILD_ROOT}%{_datadir}/mplayer/skins
 pushd ${RPM_BUILD_ROOT}%{_datadir}/mplayer/skins
-%{__tar} xjf %{SOURCE1}
-%{__ln_s} Blue default
+  for x in %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14}; do 
+    %__tar xf ${x} || exit 1
+  done
+  %__ln_s Blue default || exit 1
 popd
 
 # make sybolic link to ttf font for subtitle
@@ -288,8 +294,11 @@ fi || :
 %{_bindir}/mplayer
 %{_bindir}/gmplayer
 %{_bindir}/mencoder
-%{_datadir}/mplayer/skins/Blue
 %{_datadir}/mplayer/skins/default
+%{_datadir}/mplayer/skins/Blue
+%{_datadir}/mplayer/skins/Blue-small
+%{_datadir}/mplayer/skins/OSX-Mod
+%{_datadir}/mplayer/skins/standard
 %{_datadir}/mplayer/subfont.ttf
 %{_datadir}/applications/mplayer.desktop
 %{_datadir}/icons/hicolor/*/apps/mplayer.png
@@ -311,6 +320,11 @@ fi || :
 
 
 %changelog
+* Wed Jun 13 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.1-1
+- updated to 1.1
+  - built with ffmpeg-0.11.1
+- added some skins
+
 * Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-47.20120525
 - updated snapshot 20120525 with ffmpeg 0.11
 

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

@@ -3,16 +3,16 @@
 %global with_libvpx 1
 
 # define with_ffmpeg 1
+%global ffmpegver 0.11.1
 
 %global pkgname mplayer
 %global name	self-build-%{pkgname}
-%global version 1.0
-#% global extver	rc4
-%global svndate  20120525
-%global release	47%{?extver:.%extver}%{?svndate:.%svndate}%{?_dist_release}
+%global version 1.1
+#% global svndate  20120525
+%global release	1%{?svndate:.%svndate}%{?_dist_release}
 
-%global source0path	MPlayer/releases/MPlayer-%{version}%{extver}.tar.bz2
-%global source1path	MPlayer/skins/Blue-1.8.tar.bz2
+%global source0path	MPlayer/releases/MPlayer-%{version}.tar.xz
+%global source1url	http://ffmpeg.org/releases/ffmpeg-%{ffmpegver}.tar.bz2
 
 Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
@@ -20,13 +20,17 @@ Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
-Source10:	%{pkgname}-snapshot-vine.sh
+Source10:	mplayer-snapshot-vine.sh
 
-#Source102:        %{pkgname}-config.patch
-Source102:        %{pkgname}-config-20120525-vine.patch
-Source108:        %{pkgname}-manlinks.patch
-Source114:        %{pkgname}-nodvdcss.patch
-Source118:        %{pkgname}-ffmpeg.patch
+Source11:	http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2
+Source12:	http://www.mplayerhq.hu/MPlayer/skins/Blue-small-1.5.tar.bz2
+Source13:	http://www.mplayerhq.hu/MPlayer/skins/standard-1.9.tar.bz2
+Source14:	http://www.mplayerhq.hu/MPlayer/skins/OSX-Mod-1.1.tar.bz2
+
+Source102:        %{pkgname}-1.1-config-vine.patch
+Source108:        %{pkgname}-1.1-manlinks.patch
+Source114:        %{pkgname}-1.1-nodvdcss.patch
+Source118:        %{pkgname}-1.1-ffmpeg.patch
 
 License:	GPLv2+
 Group:		Restricted Software
@@ -35,7 +39,7 @@ Obsoletes:      mplayer < %{version}-%{release}
 Obsoletes:      self-build-mplayer < %{version}-%{release}
 
 Requires(post):		self-build-setup >= 0.9.9
-Requires(post):		subversion
+%{?svndate:Requires(post):		subversion}
 
 # (build)requies of target package.
 Requires(post):	SDL-devel
@@ -192,6 +196,9 @@ samba-libsmbclient-devel: SMB ファイルシステムのサポート
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+%{__install} -m 644 \
+    %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} \
+    ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 \
     %{SOURCE102} %{SOURCE108} %{SOURCE114} %{SOURCE118} \
     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
@@ -201,12 +208,12 @@ 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,9}.mplayerhq.hu/%{source0path} \
-#     http://www{,1,2,3,4,5,7,8,9}.mplayerhq.hu/%{source1path} \
-#     635000
-# exit 0
+## official tarball
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
+    http://www{,1,2,3,4,5,7,8,9}.mplayerhq.hu/%{source0path} \
+    %{source1url} \
+    1368000
+exit 0
 
 ## svn checkout
 # set locale
@@ -243,6 +250,11 @@ su $BUILD_USER -c "/bin/bash %{_datadir}/%{name}/%{pkgname}-snapshot-vine.sh >/d
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jun 13 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.1-1
+- updated to 1.1
+  - built with ffmpeg-0.11.1
+- added some skins
+
 * 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