Browse Source

updated self-build-{mplayer,ffmpeg}: unpacked source archives

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

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

@@ -11,8 +11,8 @@
 Summary:	Digital VCR and streaming server
 Name:		ffmpeg
 Version:	0.6
-Release:	3%{?svndate:.%svndate}%{?_dist_release}
-Source:		%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
+Release:	4%{?svndate:.%svndate}%{?_dist_release}
+Source:		http://ffmpeg.org/releases/%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 Source1:        %{name}-snapshot.sh
 
 # pre-built man files
@@ -185,6 +185,9 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 
 %changelog
+* Sat Jul 17 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.6-4
+- change release to sync with self-build-ffmpeg-vl.spec
+
 * Sun Jul 11 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.6-3
 - added BuildRequires: libvpx-devel >= 0.9.1
 

+ 11 - 5
nonfree/self-build-ffmpeg/self-build-ffmpeg-vl.spec

@@ -8,7 +8,9 @@
 %define name	self-build-%{pkgname}
 %define version 0.6
 #% define svndate	20100625
-%define release	3%{?svndate:.%svndate}%{?_dist_release}
+%define release	4%{?svndate:.%svndate}%{?_dist_release}
+
+%define sourceurl0	http://ffmpeg.org/releases/%{pkgname}-%{version}.tar.bz2
 
 ## available for v0.6 or lower
 %define with_libfaad 1
@@ -22,7 +24,7 @@ Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
-Source1:	%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
+#Source1:	%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 Source2:        %{pkgname}-snapshot.sh
 Source90:	ffmpeg.1.gz
 Source91:	ffplay.1.gz
@@ -140,8 +142,8 @@ 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} -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+#%{__install} -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+#%{__install} -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE90} %{SOURCE91} %{SOURCE92} %{SOURCE93} \
     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
@@ -149,7 +151,8 @@ MPEG4, h263, ac3, asf, avi, real, mjpeg, flash を含む
 %{__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 77000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 77000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-libs-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
@@ -180,6 +183,9 @@ Rebuild_gpac_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jul 17 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.6-4
+- unpacked source archives
+
 * Sun Jul 11 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.6-3
 - fixed some dependencies
   - Requires(post): libva-devel

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

@@ -6,7 +6,7 @@
 %define extver	rc3
 #% define release	4%{?extver:.%{extver}}%{?_dist_release}
 %define svndate  20100709
-%define release	37.%{svndate}%{?_dist_release}
+%define release	38.%{svndate}%{?_dist_release}
 
 %if %{?_dist_release} == "vl6" || %{?_dist_release} == "vl5"
 %define ttfontdir   /usr/share/fonts

+ 46 - 8
nonfree/self-build-mplayer/self-build-mplayer-vl.spec

@@ -4,7 +4,10 @@
 %define extver	rc3
 #% define release	4%{?extver:.%{extver}}%{?_dist_release}
 %define svndate  20100709
-%define release	37.%{svndate}%{?_dist_release}
+%define release	38.%{svndate}%{?_dist_release}
+
+%define source0path	MPlayer/releases/MPlayer-%{version}%{extver}.tar.bz2
+%define source1path	MPlayer/skins/Blue-1.7.tar.bz2
 
 %define with_vaapi 1
 %define with_libvpx 1
@@ -17,8 +20,8 @@ Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
 Source1:	%{pkgname}-snapshot-vine.sh
 
-Source11:	%{pkgname}-export-%{svndate}.tar.bz2
-Source12:	Blue-1.7.tar.bz2
+#Source11:	%{pkgname}-export-%{svndate}.tar.bz2
+#Source12:	Blue-1.7.tar.bz2
 
 Source102:        %{pkgname}-config.patch
 Source108:        %{pkgname}-manlinks.patch
@@ -30,7 +33,7 @@ License:	GPLv2+
 Group:		Restricted Software
 
 Requires(post):		self-build-setup >= 0.9.9
-#Requires(post):		subversion
+Requires(post):		subversion
 
 # (build)requies of target package.
 Requires(post):		gtk2-devel
@@ -173,8 +176,9 @@ samba-libsmbclient-devel: SMB ファイルシステムのサポート
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE12} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+%{__install} -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+#%{__install} -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+#%{__install} -m 644 %{SOURCE12} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE102} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE108} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE114} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
@@ -185,14 +189,48 @@ samba-libsmbclient-devel: SMB ファイルシステムのサポート
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec 635000
-
+## svn checkout
+# set locale
+case $LANG in
+    ja*)LOCALE=ja ;;
+    *) LOCALE=C ;;
+esac
+
+GetSrc_C(){
+    echo -n "     "
+    echo "Download source file with Subversion..."
+}
+
+GetSrc_ja(){
+    echo -n "     "
+    echo "Subversion を用いてソースファイルをダウンロードしています..."
+}
+
+GetSrc_$LOCALE
+
+# svn checkout
+. /etc/self-build.conf
+(cd $TEMP_DIR
+su $BUILD_USER -c "/bin/bash %{_datadir}/%{name}/%{pkgname}-snapshot-vine.sh >/dev/null 2>&1 || exit 1"
+%__mv %{pkgname}-export-%{svndate}.tar.bz2 %{_datadir}/%{name}/ || exit 1
+)
+
+# /usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
+#     http://www{,1,2,3,4,5,7,8}.mplayerhq.hu/%{source0path} \
+#     http://www{,1,2,3,4,5,7,8}.mplayerhq.hu/%{source1path} \
+#     635000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
+    http://www{,1,2,3,4,5,7,8}.mplayerhq.hu/%{source1path} \
+    635000
 
 %files
 %defattr(-,root,root)
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jul 17 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-38.20100709
+- unpacked source archives
+
 * Sat Jul 10 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.0-37.20100709
 - updated source snapshot 20100709
 - renamed %%Source10 to mplayer-snapshot-vine.sh