Author: pebender
Date: Sat Sep 27 09:50:17 2008
New Revision: 3795
Added:
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-27547.15261-x11_headers.patch
trunk/gar-minimyth/script/mediaplayers/mplayer/files/MPlayer-1.0rc2-x11_headers.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
trunk/gar-minimyth/script/mediaplayers/mplayer/Makefile
trunk/gar-minimyth/script/mediaplayers/mplayer/checksums
Log:
- Fixed MPlayer packages so that they do not pick up system X11 includes.
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 Sat Sep 27
09:50:17 2008
@@ -70,6 +70,7 @@
Fixed build system
- Fixed check bug that prevented compiling with Xorg 7.4.
+ - Fixed MPlayer packages so that they do not pick up system X11
includes.
Renamed packages
Renamed lib/mpeg2dec to lib/libmpeg2.
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 Sat Sep 27
09:50:17 2008
@@ -3,7 +3,7 @@
CATEGORIES = mediaplayers
MASTER_SITES = svn://svn.mplayerhq.hu/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME)-cross-$(GARCH_FAMILY).patch
+PATCHFILES = $(DISTNAME)-x11_headers.patch
$(DISTNAME)-cross-$(GARCH_FAMILY).patch
LICENSE = mplayer
mplayer_LICENSE_TEXT = $(WORKSRC)/Copyright
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 Sat Sep
27
09:50:17 2008
@@ -1,2 +1,3 @@
+ed3b1ee81081164af8f30e28eac3fedc
download/MPlayer-27547.15261-x11_headers.patch
99dadb98596fb7e181cbbd4f8a7485ea
download/MPlayer-27547.15261-cross-i386.patch
ea19fce18c4e841994eda4ab8efb3672
download/MPlayer-27547.15261-cross-x86_64.patch
Added:
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-27547.15261-x11_headers.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-27547.15261-x11_headers.patch
Sat Sep 27 09:50:17 2008
@@ -0,0 +1,42 @@
+diff -Naur MPlayer-27547.15261-old/configure
MPlayer-27547.15261-new/configure
+--- MPlayer-27547.15261-old/configure 2008-09-16 21:11:38.000000000 -0700
++++ MPlayer-27547.15261-new/configure 2008-09-27 08:20:15.000000000 -0700
+@@ -3955,23 +3955,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"
+
+
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer/Makefile
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer/Makefile (original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer/Makefile Sat Sep 27
09:50:17 2008
@@ -12,7 +12,7 @@
$(DISTNAME)-url_fix_20080120.patch \
$(DISTNAME)-stream_cddb_fix_20080120.patch
PATCHFILES += $(DISTNAME)-dvdnav.patch
-PATCHFILES += $(DISTNAME)-openchrome.patch
$(DISTNAME)-cross-$(GARCH_FAMILY).patch
+PATCHFILES += $(DISTNAME)-openchrome.patch $(DISTNAME)-x11_headers.patch
$(DISTNAME)-cross-$(GARCH_FAMILY).patch
LICENSE = mplayer
mplayer_LICENSE_TEXT = $(WORKSRC)/Copyright
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer/checksums
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer/checksums (original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer/checksums Sat Sep 27
09:50:17 2008
@@ -5,5 +5,6 @@
8d18842541ecd6fcec9444abcb505930
download/MPlayer-1.0rc2-stream_cddb_fix_20080120.patch
1c1f4e7fe33bc365e0d08e89f88e4f2d download/MPlayer-1.0rc2-dvdnav.patch
4906123b616be34b292551c48af4792d download/MPlayer-1.0rc2-openchrome.patch
+d4f952ba2f7be738c499cdd28034f577 download/MPlayer-1.0rc2-x11_headers.patch
dddcdb34f6fb526b8d006921a43f1203 download/MPlayer-1.0rc2-cross-i386.patch
6555b48e9fe6775cf95d5d5cae13ff64
download/MPlayer-1.0rc2-cross-x86_64.patch
Added:
trunk/gar-minimyth/script/mediaplayers/mplayer/files/MPlayer-1.0rc2-x11_headers.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/mediaplayers/mplayer/files/MPlayer-1.0rc2-x11_headers.patch
Sat Sep 27 09:50:17 2008
@@ -0,0 +1,38 @@
+diff -Naur MPlayer-1.0rc2-old/configure MPlayer-1.0rc2-new/configure
+--- MPlayer-1.0rc2-old/configure 2008-09-27 08:04:03.000000000 -0700
++++ MPlayer-1.0rc2-new/configure 2008-09-27 08:16:45.000000000 -0700
+@@ -3857,21 +3857,21 @@
+ 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
+- 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
++# break
++# fi
++# done
++# 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
+ echores "$_x11_headers"
+
+
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
