Author: pebender
Date: Mon Dec 8 16:53:11 2008
New Revision: 4062
Added:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-ati/files/xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.4/xf86-video-ati/files/xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-pkg_config.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/xorg-7.3/xf86-video-ati/Makefile
trunk/gar-minimyth/script/xorg-7.3/xf86-video-ati/checksums
trunk/gar-minimyth/script/xorg-7.4/xf86-video-ati/Makefile
trunk/gar-minimyth/script/xorg-7.4/xf86-video-ati/checksums
Log:
- Updated packages
xorg-7.3/xf86-video-ati
xorg-7.4/xf86-video-ati
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 Mon Dec 8
16:53:11 2008
@@ -101,9 +101,11 @@
Updated xorg-7.3/libXi.
Updated xorg-7.3/pixman.
Updated xorg-7.3/util-macros.
+ Updated xorg-7.3/xf86-video-ati.
Updated xorg-7.4/libXi.
Updated xorg-7.4/pixman.
Updated xorg-7.4/util-macros.
+ Updated xorg-7.4/xf86-video-ati.
--------------------------------------------------------------------------------
Changes since 60 (2008-11-28):
Modified: trunk/gar-minimyth/script/xorg-7.3/xf86-video-ati/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.3/xf86-video-ati/Makefile (original)
+++ trunk/gar-minimyth/script/xorg-7.3/xf86-video-ati/Makefile Mon Dec 8
16:53:11 2008
@@ -1,7 +1,12 @@
GARNAME = xf86-video-ati
-GARVERSION = 6.9.0
+GARVERSION_TYPE = git
+GARVERSION = $(strip $(if $(filter git,$(GARVERSION_TYPE)) , \
+ c72b732a2f5597cd72bd4ebe207799ae07f2681e , \
+ 6.9.0 ))
CATEGORIES = $(CATEGORY)
-MASTER_SITES = $(XORG_MASTER_SITES)
+MASTER_SITES = $(strip $(if $(filter git,$(GARVERSION_TYPE)) , \
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati/ , \
+ $(XORG_MASTER_SITES) ))
DISTFILES = $(DISTNAME).tar.bz2
PATCHFILES = $(DISTNAME)-pkg_config.patch
LICENSE = $(GARNAME)
@@ -42,6 +47,13 @@
GAR_EXTRA_CONF += $(CATEGORY)/xorg/package-api.mk
include ../../gar.mk
+
+git//%$(DISTNAME).tar.bz2:
+ @$(call FETCH_GIT, $*, $(GARVERSION), $(DISTNAME))
+ @$(MAKECOOKIE)
+
+checksum-$(DISTNAME).tar.bz2:
+ @$(MAKECOOKIE)
pre-configure:
@rm -f $(WORKSRC)/acinclude.m4
Modified: trunk/gar-minimyth/script/xorg-7.3/xf86-video-ati/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.3/xf86-video-ati/checksums (original)
+++ trunk/gar-minimyth/script/xorg-7.3/xf86-video-ati/checksums Mon Dec 8
16:53:11 2008
@@ -1,2 +1,4 @@
afa4873f58ae6fa31fedeb9ed31531db download/xf86-video-ati-6.9.0.tar.bz2
92cd5f4bffbab092a19f6b3473b7f5d7
download/xf86-video-ati-6.9.0-pkg_config.patch
+
+7cd053156470edcbe0be960b7ee38317
download/xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-pkg_config.patch
Added:
trunk/gar-minimyth/script/xorg-7.3/xf86-video-ati/files/xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-pkg_config.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.3/xf86-video-ati/files/xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-pkg_config.patch
Mon Dec 8 16:53:11 2008
@@ -0,0 +1,21 @@
+diff -Naur
xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-old/configure.ac
xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-new/configure.ac
+---
xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-old/configure.ac
2008-12-08 11:57:33.000000000 -0800
++++
xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-new/configure.ac
2008-12-08 11:59:13.000000000 -0800
+@@ -38,6 +38,7 @@
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ AC_PROG_CC
++PKG_PROG_PKG_CONFIG
+
+ if test "x$GCC" = "xyes"; then
+ CPPFLAGS="$CPPFLAGS -Wall"
+@@ -77,7 +78,8 @@
+
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto
$REQUIRED_MODULES])
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++sdkdir="$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=sdkdir
xorg-server)"
+
+ # Checks for libraries.
+
Modified: trunk/gar-minimyth/script/xorg-7.4/xf86-video-ati/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/xf86-video-ati/Makefile (original)
+++ trunk/gar-minimyth/script/xorg-7.4/xf86-video-ati/Makefile Mon Dec 8
16:53:11 2008
@@ -1,7 +1,12 @@
GARNAME = xf86-video-ati
-GARVERSION = 6.9.0
+GARVERSION_TYPE = git
+GARVERSION = $(strip $(if $(filter git,$(GARVERSION_TYPE)) , \
+ c72b732a2f5597cd72bd4ebe207799ae07f2681e , \
+ 6.9.0 ))
CATEGORIES = $(CATEGORY)
-MASTER_SITES = $(XORG_MASTER_SITES)
+MASTER_SITES = $(strip $(if $(filter git,$(GARVERSION_TYPE)) , \
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati/ , \
+ $(XORG_MASTER_SITES) ))
DISTFILES = $(DISTNAME).tar.bz2
PATCHFILES = $(DISTNAME)-pkg_config.patch
LICENSE = $(GARNAME)
@@ -42,6 +47,13 @@
GAR_EXTRA_CONF += $(CATEGORY)/xorg/package-api.mk
include ../../gar.mk
+
+git//%$(DISTNAME).tar.bz2:
+ @$(call FETCH_GIT, $*, $(GARVERSION), $(DISTNAME))
+ @$(MAKECOOKIE)
+
+checksum-$(DISTNAME).tar.bz2:
+ @$(MAKECOOKIE)
pre-configure:
@rm -f $(WORKSRC)/acinclude.m4
Modified: trunk/gar-minimyth/script/xorg-7.4/xf86-video-ati/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/xf86-video-ati/checksums (original)
+++ trunk/gar-minimyth/script/xorg-7.4/xf86-video-ati/checksums Mon Dec 8
16:53:11 2008
@@ -1,2 +1,4 @@
afa4873f58ae6fa31fedeb9ed31531db download/xf86-video-ati-6.9.0.tar.bz2
92cd5f4bffbab092a19f6b3473b7f5d7
download/xf86-video-ati-6.9.0-pkg_config.patch
+
+7cd053156470edcbe0be960b7ee38317
download/xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-pkg_config.patch
Added:
trunk/gar-minimyth/script/xorg-7.4/xf86-video-ati/files/xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-pkg_config.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xf86-video-ati/files/xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-pkg_config.patch
Mon Dec 8 16:53:11 2008
@@ -0,0 +1,21 @@
+diff -Naur
xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-old/configure.ac
xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-new/configure.ac
+---
xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-old/configure.ac
2008-12-08 11:57:33.000000000 -0800
++++
xf86-video-ati-c72b732a2f5597cd72bd4ebe207799ae07f2681e-new/configure.ac
2008-12-08 11:59:13.000000000 -0800
+@@ -38,6 +38,7 @@
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ AC_PROG_CC
++PKG_PROG_PKG_CONFIG
+
+ if test "x$GCC" = "xyes"; then
+ CPPFLAGS="$CPPFLAGS -Wall"
+@@ -77,7 +78,8 @@
+
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto
$REQUIRED_MODULES])
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++sdkdir="$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=sdkdir
xorg-server)"
+
+ # Checks for libraries.
+
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
