updated {,self-build-}mpplayer-vl.spec: dropped BR: esound-devel (esound-devel is obsolete on Vine Linux 6 or higher)

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

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

@@ -4,10 +4,12 @@
 %define name	mplayer
 %define version	1.0
 %define extver	rc4
-%define release	41%{?extver:.%{extver}}%{?_dist_release}
+%define release	42%{?extver:.%{extver}}%{?_dist_release}
 %define svndate  20100709
 #% define release	40.%{svndate}%{?_dist_release}
 
+# define dvbappver 0.95
+
 %define ttfontdir   /usr/share/fonts
 %define ttfontlist  TrueType-vlgothic/VL-PGothic-Regular \\\
                     TrueType-sazanami-gothic/sazanami-gothic
@@ -21,6 +23,13 @@ Source0:	http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{extver}.ta
 #Source0:	mplayer-export-%{svndate}.tar.bz2
 Source1:	http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.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
+
 #Patch2:         %{name}-config.patch
 Patch2:         %{name}-config-20100709-vine.patch
 Patch8:         %{name}-manlinks.patch
@@ -28,6 +37,13 @@ Patch14:        %{name}-nodvdcss.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+
 Group:		Applications/Multimedia
@@ -38,7 +54,6 @@ BuildRequires:  aalib-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	cdparanoia-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:	esound-devel
 BuildRequires:  enca-devel
 BuildRequires:	freetype2-devel >= 2.0.9
 BuildRequires:  fribidi-devel
@@ -141,6 +156,26 @@ MPlayer は何もしなくても DVD や MPEG-1/2/4 のように一般的なフ
 
 %patch50 -p1 -b .x11
 
+# ## 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
+
 %build
 ./configure \
     --prefix=%{_prefix} \
@@ -262,6 +297,9 @@ done
 
 
 %changelog
+* Sun Jun 19 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-42.rc4
+- dropped BuildRequires: esound-devel
+
 * Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-41.rc4
 - new upstream release
   - ready for Vine Linux 6

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

@@ -2,7 +2,7 @@
 %define name	self-build-%{pkgname}
 %define version 1.0
 %define extver	rc4
-%define release	41%{?extver:.%{extver}}%{?_dist_release}
+%define release	42%{?extver:.%{extver}}%{?_dist_release}
 %define svndate  20100709
 #% define release	40.%{svndate}%{?_dist_release}
 
@@ -42,7 +42,6 @@ Requires(post):  aalib-devel
 Requires(post):	alsa-lib-devel
 Requires(post):	cdparanoia-devel
 Requires(post):  desktop-file-utils
-Requires(post):	esound-devel
 Requires(post):  enca-devel
 Requires(post):	freetype2-devel >= 2.0.9
 Requires(post):  fribidi-devel
@@ -258,6 +257,9 @@ su $BUILD_USER -c "/bin/bash %{_datadir}/%{name}/%{pkgname}-snapshot-vine.sh >/d
 %{_datadir}/%{name}
 
 %changelog
+* Sun Jun 19 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-42.rc4
+- dropped Requires(post): esound-devel
+
 * Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-41.rc4
 - new upstream release
   - ready for Vine Linux 6