Author: pebender
Date: Tue Mar 3 15:00:20 2009
New Revision: 4438
Removed:
trunk/gar-minimyth/script/lib/libdvdnav/package-api.mk
Modified:
trunk/gar-minimyth/script/lib/ffmpeg/Makefile
trunk/gar-minimyth/script/lib/libdvdnav/Makefile
trunk/gar-minimyth/script/lib/libdvdread/Makefile
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-x11_headers.patch
Log:
- Made additional changes to simplify the updating of MPlayer and FFpeg
trunk further.
Modified: trunk/gar-minimyth/script/lib/ffmpeg/Makefile
==============================================================================
--- trunk/gar-minimyth/script/lib/ffmpeg/Makefile (original)
+++ trunk/gar-minimyth/script/lib/ffmpeg/Makefile Tue Mar 3 15:00:20 2009
@@ -1,5 +1,5 @@
GARNAME = ffmpeg
-GARVERSION = $(FFMPEG_TRUNK_VERSION).$(MPLAYER_TRUNK_VERSION)
+GARVERSION = 17751.$(MPLAYER_TRUNK_VERSION)
CATEGORIES = lib
MASTER_SITES = svn://svn.ffmpeg.org/
DISTFILES = $(DISTNAME).tar.bz2
@@ -140,7 +140,7 @@
@$(call FETCH_SVN, svn://$*, $(GARVERSION), $(DISTNAME))
@$(MAKECOOKIE)
-# When using the SVN version, GARVERSION must have the form
<ffmpeg-svn-version>.<mplayer-svn-version>.
+# When using the SVN version, GARVERSION must have the form
<ffmpeg-trunk-version>.<mplayer-trunk-version>.
# This is done to ensure that the correct version of libswscale is used.
svn//%/$(DISTNAME).tar.bz2:
@$(call FETCH_SVN, svn://$*/ffmpeg/trunk , $(word
1,$(subst ., ,$(GARVERSION))), $(DISTNAME))
Modified: trunk/gar-minimyth/script/lib/libdvdnav/Makefile
==============================================================================
--- trunk/gar-minimyth/script/lib/libdvdnav/Makefile (original)
+++ trunk/gar-minimyth/script/lib/libdvdnav/Makefile Tue Mar 3 15:00:20
2009
@@ -1,5 +1,5 @@
GARNAME = libdvdnav
-GARVERSION = $(DVDNAV_TRUNK_VERSION)
+GARVERSION = 1168
CATEGORIES = lib
MASTER_SITES = svn://svn.mplayerhq.hu/dvdnav/trunk/$(GARNAME)/
DISTFILES = $(DISTNAME).tar.bz2
Modified: trunk/gar-minimyth/script/lib/libdvdread/Makefile
==============================================================================
--- trunk/gar-minimyth/script/lib/libdvdread/Makefile (original)
+++ trunk/gar-minimyth/script/lib/libdvdread/Makefile Tue Mar 3 15:00:20
2009
@@ -1,5 +1,5 @@
GARNAME = libdvdread
-GARVERSION = $(DVDNAV_TRUNK_VERSION)
+GARVERSION = 1168
CATEGORIES = lib
MASTER_SITES = svn://svn.mplayerhq.hu/dvdnav/trunk/$(GARNAME)/
DISTFILES = $(DISTNAME).tar.bz2
@@ -19,7 +19,6 @@
CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \
--with-gnu-ld
-GAR_EXTRA_CONF += lib/libdvdnav/package-api.mk
include ../../gar.mk
svn//%/$(DISTNAME).tar.bz2:
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile (original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile Tue Mar 3
15:00:20 2009
@@ -1,7 +1,8 @@
GARNAME = MPlayer
-GARVERSION =
$(MPLAYER_TRUNK_VERSION).$(FFMPEG_TRUNK_VERSION).$(DVDNAV_TRUNK_VERSION)
+GARVERSION = $(MPLAYER_TRUNK_VERSION)
CATEGORIES = mediaplayers
-MASTER_SITES = svn://svn.mplayerhq.hu/
+MASTER_SITES = svn://svn.mplayerhq.hu/mplayer/trunk/
+SOURCEPKG = lib/ffmpeg lib/libdvdnav lib/libdvdread
DISTFILES = $(DISTNAME).tar.bz2
PATCHFILES = $(GARNAME)-x11_headers.patch
LICENSE = mplayer
@@ -268,33 +269,35 @@
BUILD_ENV = \
DESTDIR="$(DESTDIR)"
-GAR_EXTRA_CONF += lib/ffmpeg/package-api.mk lib/libdvdnav/package-api.mk
include ../../gar.mk
CFLAGS :=
-# When using the SVN version, GARVERSION must have the form
<mplayer-svn-version>.<ffmpeg-svn-version>.<dvdnav-svn-version>.
-# This is done to ensure that the correct version of FFmpeg is used.
svn//%/$(DISTNAME).tar.bz2:
- @$(call FETCH_SVN, svn://$*/mplayer/trunk , $(word
1,$(subst ., ,$(GARVERSION))), $(DISTNAME))
- @$(call FETCH_SVN, svn://$*/ffmpeg/trunk/libavutil , $(word
2,$(subst ., ,$(GARVERSION))), libavutil )
- @$(call FETCH_SVN, svn://$*/ffmpeg/trunk/libavcodec , $(word
2,$(subst ., ,$(GARVERSION))), libavcodec )
- @$(call FETCH_SVN, svn://$*/ffmpeg/trunk/libavformat, $(word
2,$(subst ., ,$(GARVERSION))), libavformat)
- @$(call FETCH_SVN, svn://$*/ffmpeg/trunk/libpostproc, $(word
2,$(subst ., ,$(GARVERSION))), libpostproc)
- @$(call FETCH_SVN, svn://$*/dvdnav/trunk/libdvdnav , $(word
3,$(subst ., ,$(GARVERSION))), libdvdnav )
- @$(call FETCH_SVN, svn://$*/dvdnav/trunk/libdvdread , $(word
3,$(subst ., ,$(GARVERSION))), libdvdread4)
+ @$(call FETCH_SVN, svn://$*, $(GARVERSION), $(DISTNAME))
@cd $(PARTIALDIR) ; tar -jxf $(DISTNAME).tar.bz2 ; rm -r
$(DISTNAME).tar.bz2
- @cd $(PARTIALDIR) ; tar -jxf libavutil.tar.bz2 ; rm -r
libavutil.tar.bz2 ; rm -rf $(DISTNAME)/libavutil ; mv libavutil
$(DISTNAME)/
- @cd $(PARTIALDIR) ; tar -jxf libavcodec.tar.bz2 ; rm -r
libavcodec.tar.bz2 ; rm -rf $(DISTNAME)/libavcodec ; mv libavcodec
$(DISTNAME)/
- @cd $(PARTIALDIR) ; tar -jxf libavformat.tar.bz2 ; rm -r
libavformat.tar.bz2 ; rm -rf $(DISTNAME)/libavformat ; mv libavformat
$(DISTNAME)/
- @cd $(PARTIALDIR) ; tar -jxf libpostproc.tar.bz2 ; rm -r
libpostproc.tar.bz2 ; rm -rf $(DISTNAME)/libpostproc ; mv libpostproc
$(DISTNAME)/
- @cd $(PARTIALDIR) ; tar -jxf libdvdnav.tar.bz2 ; rm -r
libdvdnav.tar.bz2 ; rm -rf $(DISTNAME)/libdvdnav ; mv libdvdnav
$(DISTNAME)/
- @cd $(PARTIALDIR) ; tar -jxf libdvdread4.tar.bz2 ; rm -r
libdvdread4.tar.bz2 ; rm -rf $(DISTNAME)/libdvdread4 ; mv libdvdread4
$(DISTNAME)/
+ @cd $(PARTIALDIR) ; rm -rf $(DISTNAME)/libavcodec
+ @cd $(PARTIALDIR) ; rm -rf $(DISTNAME)/libavformat
+ @cd $(PARTIALDIR) ; rm -rf $(DISTNAME)/libavutil
+ @cd $(PARTIALDIR) ; rm -rf $(DISTNAME)/libpostproc
+ @cd $(PARTIALDIR) ; rm -rf $(DISTNAME)/libswscale
+ @cd $(PARTIALDIR) ; rm -rf $(DISTNAME)/libdvdnav
+ @cd $(PARTIALDIR) ; rm -rf $(DISTNAME)/libdvdread4
@cd $(PARTIALDIR) ; tar -jcf $(DISTNAME).tar.bz2 $(DISTNAME)
@cd $(PARTIALDIR) ; rm -rf $(DISTNAME)
@$(MAKECOOKIE)
checksum-$(DISTNAME).tar.bz2:
+ @$(MAKECOOKIE)
+
+post-patch:
+ @mv $(wildcard $(WORKDIR)/ffmpeg-*)/libavcodec $(WORKSRC)/libavcodec
+ @mv $(wildcard $(WORKDIR)/ffmpeg-*)/libavformat $(WORKSRC)/libavformat
+ @mv $(wildcard $(WORKDIR)/ffmpeg-*)/libavutil $(WORKSRC)/libavutil
+ @mv $(wildcard $(WORKDIR)/ffmpeg-*)/libpostproc $(WORKSRC)/libpostproc
+ @mv $(wildcard $(WORKDIR)/ffmpeg-*)/libswscale $(WORKSRC)/libswscale
+ @mv $(wildcard $(WORKDIR)/libdvdnav-*) $(WORKSRC)/libdvdnav
+ @mv $(wildcard $(WORKDIR)/libdvdread-*) $(WORKSRC)/libdvdread4
@$(MAKECOOKIE)
install-config:
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
(original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums Tue Mar
3
15:00:20 2009
@@ -1 +1 @@
-70bae0ccdf89daf993d87f60a454e5ae download/MPlayer-x11_headers.patch
+24bd872ed17023e06e789542a56f1495 download/MPlayer-x11_headers.patch
Modified:
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-x11_headers.patch
==============================================================================
---
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-x11_headers.patch
(original)
+++
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-x11_headers.patch
Tue Mar 3 15:00:20 2009
@@ -1,6 +1,6 @@
-diff -Naur MPlayer-28799.17751.1168-old/configure
MPlayer-28799.17751.1168-new/configure
---- MPlayer-28799.17751.1168-old/configure 2009-03-02 23:15:18.000000000
-0800
-+++ MPlayer-28799.17751.1168-new/configure 2009-03-02 23:17:18.000000000
-0800
+diff -Naur MPlayer-28799-old/configure MPlayer-28799-new/configure
+--- MPlayer-28799-old/configure 2009-03-03 08:39:56.000000000 -0800
++++ MPlayer-28799-new/configure 2009-03-03 08:41:04.000000000 -0800
@@ -4142,23 +4142,23 @@
echocheck "X11 headers presence"
_x11_headers="no"
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
