Author: pebender
Date: Tue Mar 3 06:58:00 2009
New Revision: 4436
Added:
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg.patch.gar
trunk/gar-minimyth/script/lib/ffmpeg/package-api.mk
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-x11_headers.patch
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk
Removed:
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-28715.17550.1168-x11_headers.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/index.html
trunk/gar-minimyth/script/lib/ffmpeg/Makefile
trunk/gar-minimyth/script/lib/ffmpeg/checksums
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
Log:
- Changed mediaplayers/mplayer-svn, lib/ffmpeg, lib/libdvdnav and
lib/libdvdread so that it is easier to update mediaplayers/mplayer-svn
and lib/ffmpeg.
- Updated FFmpeg and MPlayer SVN versions.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Tue Mar 3
06:58:00 2009
@@ -41,6 +41,11 @@
- Changed the LIRC devinput lircd.conf files so that they match the
format
found in the lirc-0.8.5pre1.
+Modified build system
+ - Changed mediaplayers/mplayer-svn, lib/ffmpeg, lib/libdvdnav and
+ lib/libdvdread so that it is easier to update
mediaplayers/mplayer-svn
+ and lib/ffmpeg.
+
Fixed build system
- Patched disk/e2fsprogs so that chmod's during build are more likely
to
work and less likely to result in unnecessarily fatal build errors.
Modified: trunk/gar-minimyth/html/minimyth/index.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/index.html (original)
+++ trunk/gar-minimyth/html/minimyth/index.html Tue Mar 3 06:58:00 2009
@@ -58,8 +58,8 @@
</li>
<li><a
href="http://home.kabelfoon.nl/~moongies/streamtuned.html";>MythStream</a>
<strong>0.18_1</strong></li>
<li>
- <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>SVN
28715</strong> and
- <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
17550</strong>
+ <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>SVN
28799</strong> and
+ <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
17751</strong>
</li>
<li>
<a href="http://www.mplayerhq.hu/";>MPlayer</a>
<strong>1.0rc2</strong> with patches to add
@@ -70,13 +70,13 @@
</li>
<li>
<a href="http://www.videolan.org/";>VLC</a>
<strong>0.9.8a</strong> and
- <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
17550</strong>
+ <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
17751</strong>
(experimental)
</li>
<li>
<a href="http://www.xinehq.de/";>xine-ui</a>
<strong>0.99.5</strong>,
<a href="http://www.xinehq.de/";>xine-lib</a>
<strong>1.1.16.1</strong> and
- <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
17550</strong>
+ <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
17751</strong>
</li>
<li>
<a href="http://fceultra.sourceforge.net/";>FCE Ultra</a>
<strong>0.98.13-pre</strong>
@@ -198,7 +198,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2009-03-02
+ Last Updated on 2009-03-03
<br />
< mailto : webmaster at minimyth dot org >
</div>
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 06:58:00 2009
@@ -1,9 +1,9 @@
GARNAME = ffmpeg
-GARVERSION = 17550.28715
+GARVERSION = $(FFMPEG_TRUNK_VERSION).$(MPLAYER_TRUNK_VERSION)
CATEGORIES = lib
MASTER_SITES = svn://svn.ffmpeg.org/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME).patch.gar
+PATCHFILES = $(GARNAME).patch.gar
LICENSE = GPL2/LGPL2_1
DESCRIPTION =
@@ -133,6 +133,7 @@
CONFIGURE_ENV = \
SDL_CONFIG='/bin/false'
+GAR_EXTRA_CONF += mediaplayers/mplayer-svn/package-api.mk
include ../../gar.mk
svn//%/$(DISTNAME).tar.bz2:
@@ -152,3 +153,46 @@
checksum-$(DISTNAME).tar.bz2:
@$(MAKECOOKIE)
+
+clean-all:
+ @$(MAKE) clean
+ @rm -rf $(DESTDIR)$(includedir)/ffmpeg
+ @rm -rf $(DESTDIR)$(libdir)/libavcodec.*
+ @rm -rf $(DESTDIR)$(libdir)/libavdevice.*
+ @rm -rf $(DESTDIR)$(libdir)/libavformat.*
+ @rm -rf $(DESTDIR)$(libdir)/libavutil.*
+ @rm -rf $(DESTDIR)$(libdir)/libpostproc.*
+ @rm -rf $(DESTDIR)$(libdir)/libswscale.*
+ @rm -rf $(DESTDIR)$(bin)/ffmpeg
+
+source-update:
+ @$(MAKE) source-update-source
+ @$(MAKE) source-update-patches
+
+source-update-source:
+ @$(MAKE) clean
+ @$(MAKE) fetch
+ @$(MAKE) $(GARCHIVEDIR)/$(DISTNAME).tar.bz2
+ @$(MAKE) clean
+
+source-update-patches:
+ @$(MAKE) clean
+ @$(MAKE) extract
+ @$(foreach PATCHFILE, $(PATCHFILES), \
+ cd $(WORKDIR) || exit 1 ; \
+ mv $(DISTNAME) $(DISTNAME)-old || exit 1 ; \
+ cp -r $(DISTNAME)-old $(DISTNAME)-new || exit 1 ; \
+ cd $(DISTNAME)-new || exit 1 ; \
+ SIMPLE_BACKUP_SUFFIX=.gar-source-patches-update patch -p1
< ../../../files/$(PATCHFILE) || exit 1 ; \
+ cd ../ || exit 1 ; \
+ find $(DISTNAME)-new -name *.gar-source-patches-update -exec rm
{} \; ||
exit 1 ; \
+ ( diff -Naur $(DISTNAME)-old $(DISTNAME)-new
> ../../files/$(PATCHFILE) ; test $$? -lt 2 ) || exit 1 ; \
+ rm -fr $(DISTNAME)-old || exit 1 ; \
+ mv $(DISTNAME)-new $(DISTNAME) || exit 1 ; \
+ cd ../../ || exit 1 ; \
+ rm -f checksums~ || exit 1 ; \
+ cat checksums | grep -v $(DOWNLOADDIR)/$(PATCHFILE) >
checksums~ ; \
+ md5sum $(DOWNLOADDIR)/$(PATCHFILE) >> checksums~ || exit 1 ; \
+ rm -f checksums || exit 1 ; \
+ mv -f checksums~ checksums || exit 1 ; )
+ @$(MAKE) clean
Modified: trunk/gar-minimyth/script/lib/ffmpeg/checksums
==============================================================================
--- trunk/gar-minimyth/script/lib/ffmpeg/checksums (original)
+++ trunk/gar-minimyth/script/lib/ffmpeg/checksums Tue Mar 3 06:58:00 2009
@@ -1 +1 @@
-aa3e9c8207617bfa0d01404105404ff0 download/ffmpeg-17550.28715.patch.gar
+1b79ff853df7b2e1f277b3de78c3aa5b download/ffmpeg.patch.gar
Added: trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg.patch.gar
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg.patch.gar Tue Mar 3
06:58:00 2009
@@ -0,0 +1,46 @@
+diff -Naur ffmpeg-17751.28799-old/configure
ffmpeg-17751.28799-new/configure
+--- ffmpeg-17751.28799-old/configure 2009-03-02 23:11:16.000000000 -0800
++++ ffmpeg-17751.28799-new/configure 2009-03-02 23:11:34.000000000 -0800
+@@ -718,11 +718,11 @@
+ func=$4
+ shift 4
+ disable $cfg
+- check_cmd ${pkg}-config --version
++ check_cmd @GAR_DESTDIR@@GAR_bindir@/${pkg}-config --version
+ err=$?
+ if test "$err" = 0; then
+- temp_cflags `${pkg}-config --cflags`
+- temp_extralibs `${pkg}-config --libs`
++ temp_cflags `...@gar_destdir@@GAR_bindir@/${pkg}-config --cflags`
++ temp_extralibs `...@gar_destdir@@GAR_bindir@/${pkg}-config --libs`
+ check_lib "$@" $header $func && enable $cfg
+ fi
+ return $err
+@@ -2039,7 +2039,7 @@
+
+ disable sdl_too_old
+ disable sdl
+-SDL_CONFIG="${cross_prefix}sdl-config"
++SDL_CONFIG="${SDL_CONFIG:-...@gar_destdir@@GAR_bindir@/sdl-config}"
+ if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
+ sdl_cflags=`"${SDL_CONFIG}" --cflags`
+ temp_cflags $sdl_cflags
+diff -Naur ffmpeg-17751.28799-old/Makefile ffmpeg-17751.28799-new/Makefile
+--- ffmpeg-17751.28799-old/Makefile 2009-03-02 23:11:16.000000000 -0800
++++ ffmpeg-17751.28799-new/Makefile 2009-03-02 23:11:34.000000000 -0800
+@@ -93,11 +93,11 @@
+
+ HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS)
$(HOOKS-yes)))
+
+-VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags`
+-LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
++VHOOKCFLAGS-$(HAVE_IMLIB2) += `...@gar_destdir@@GAR_bindir@/imlib2-config
--cflags`
++LIBS_imlib2$(SLIBSUF) = `...@gar_destdir@@GAR_bindir@/imlib2-config
--libs`
+
+-VHOOKCFLAGS-$(HAVE_FREETYPE2) += `freetype-config --cflags`
+-LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
++VHOOKCFLAGS-$(HAVE_FREETYPE2) +=
`...@gar_destdir@@GAR_bindir@/freetype-config --cflags`
++LIBS_drawtext$(SLIBSUF) =
`...@gar_destdir@@GAR_bindir@/freetype-config --libs`
+
+ VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
+
Added: trunk/gar-minimyth/script/lib/ffmpeg/package-api.mk
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/lib/ffmpeg/package-api.mk Tue Mar 3 06:58:00
2009
@@ -0,0 +1 @@
+FFMPEG_TRUNK_VERSION=17751
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
06:58:00 2009
@@ -1,9 +1,9 @@
GARNAME = MPlayer
-GARVERSION = 28715.17550.1168
+GARVERSION =
$(MPLAYER_TRUNK_VERSION).$(FFMPEG_TRUNK_VERSION).$(DVDNAV_TRUNK_VERSION)
CATEGORIES = mediaplayers
MASTER_SITES = svn://svn.mplayerhq.hu/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME)-x11_headers.patch
+PATCHFILES = $(GARNAME)-x11_headers.patch
LICENSE = mplayer
mplayer_LICENSE_TEXT = $(WORKSRC)/Copyright
@@ -268,6 +268,7 @@
BUILD_ENV = \
DESTDIR="$(DESTDIR)"
+GAR_EXTRA_CONF += lib/ffmpeg/package-api.mk lib/libdvdnav/package-api.mk
include ../../gar.mk
CFLAGS :=
@@ -308,3 +309,35 @@
@rm -f $(DESTDIR)$(bindir)/mplayer-svn
@mv -f $(DESTDIR)$(bindir)/mplayer $(DESTDIR)$(bindir)/mplayer-svn
@$(MAKECOOKIE)
+
+source-update:
+ @$(MAKE) source-update-source
+ @$(MAKE) source-update-patches
+
+source-update-source:
+ @$(MAKE) clean
+ @$(MAKE) fetch
+ @$(MAKE) $(GARCHIVEDIR)/$(DISTNAME).tar.bz2
+ @$(MAKE) clean
+
+source-update-patches:
+ @$(MAKE) clean
+ @$(MAKE) extract
+ @$(foreach PATCHFILE, $(PATCHFILES), \
+ cd $(WORKDIR) || exit 1 ; \
+ mv $(DISTNAME) $(DISTNAME)-old || exit 1 ; \
+ cp -r $(DISTNAME)-old $(DISTNAME)-new || exit 1 ; \
+ cd $(DISTNAME)-new || exit 1 ; \
+ SIMPLE_BACKUP_SUFFIX=.gar-source-patches-update patch -p1
< ../../../files/$(PATCHFILE) || exit 1 ; \
+ cd ../ || exit 1 ; \
+ find $(DISTNAME)-new -name *.gar-source-patches-update -exec rm
{} \; ||
exit 1 ; \
+ ( diff -Naur $(DISTNAME)-old $(DISTNAME)-new
> ../../files/$(PATCHFILE) ; test $$? -lt 2 ) || exit 1 ; \
+ rm -fr $(DISTNAME)-old || exit 1 ; \
+ mv $(DISTNAME)-new $(DISTNAME) || exit 1 ; \
+ cd ../../ || exit 1 ; \
+ rm -f checksums~ || exit 1 ; \
+ cat checksums | grep -v $(DOWNLOADDIR)/$(PATCHFILE) >
checksums~ ; \
+ md5sum $(DOWNLOADDIR)/$(PATCHFILE) >> checksums~ || exit 1 ; \
+ rm -f checksums || exit 1 ; \
+ mv -f checksums~ checksums || exit 1 ; )
+ @$(MAKE) clean
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
06:58:00 2009
@@ -1 +1 @@
-bb011f26781d53328b4f58b265d9410d
download/MPlayer-28715.17550.1168-x11_headers.patch
+70bae0ccdf89daf993d87f60a454e5ae download/MPlayer-x11_headers.patch
Added:
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-x11_headers.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-x11_headers.patch
Tue Mar 3 06:58:00 2009
@@ -0,0 +1,42 @@
+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
+@@ -4142,23 +4142,23 @@
+ echocheck "X11 headers presence"
+ _x11_headers="no"
+ _res_comment="check if the dev(el) packages are installed"
+- for I in `echo $_inc_extra | sed s/-I//g` /usr/include ; do
+- if test -f "$I/X11/Xlib.h" ; then
++# for I in `echo $_inc_extra | sed s/-I//g` /usr/include ; do
++# if test -f "$I/X11/Xlib.h" ; then
+ _x11_headers="yes"
+ _res_comment=""
+- break
+- fi
+- done
+- if test $_cross_compile = no; then
+- for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6
/usr/openwin/include ; do
+- if test -f "$I/X11/Xlib.h" ; then
+- _inc_extra="$_inc_extra -I$I"
+- _x11_headers="yes"
+- _res_comment="using $I"
+- break
+- fi
+- done
+- fi
++# break
++# fi
++# done
++# if test $_cross_compile = no; then
++# for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6
/usr/openwin/include ; do
++# if test -f "$I/X11/Xlib.h" ; then
++# _inc_extra="$_inc_extra -I$I"
++# _x11_headers="yes"
++# _res_comment="using $I"
++# break
++# fi
++# done
++# fi
+ echores "$_x11_headers"
+
+
Added: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk Tue
Mar 3 06:58:00 2009
@@ -0,0 +1 @@
+MPLAYER_TRUNK_VERSION=28799
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
