Author: pebender
Date: Wed Jun 24 09:45:58 2009
New Revision: 5048
Added:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.1-duplicate_headers.patch
Removed:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.1-xv_sdk_includes.patch
Modified:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/Makefile
trunk/gar-minimyth/script/xorg-7.4/xorg-server/checksums
Log:
- Fix all the dumplicate header files in xorg-7.4/xorg-server Makefile.am
files.
Modified: trunk/gar-minimyth/script/xorg-7.4/xorg-server/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/xorg-server/Makefile (original)
+++ trunk/gar-minimyth/script/xorg-7.4/xorg-server/Makefile Wed Jun 24
09:45:58 2009
@@ -4,7 +4,7 @@
MASTER_SITES = $(XORG_MASTER_SITES)
DISTFILES = $(DISTNAME).tar.bz2
PATCHFILES = \
- $(DISTNAME)-xv_sdk_includes.patch \
+ $(DISTNAME)-duplicate_headers.patch \
$(DISTNAME)-xdmcp.patch \
$(DISTNAME)-perl.patch.gar \
$(DISTNAME)-pkg_config.patch \
Modified: trunk/gar-minimyth/script/xorg-7.4/xorg-server/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/xorg-server/checksums (original)
+++ trunk/gar-minimyth/script/xorg-7.4/xorg-server/checksums Wed Jun 24
09:45:58 2009
@@ -1,5 +1,5 @@
ed0878bf32a24d4948c3b8a122a39eff download/xorg-server-1.6.1.tar.bz2
-b397f26a7bac3b0738c01b5956dbb70e
download/xorg-server-1.6.1-xv_sdk_includes.patch
+ccdbe325dbca6a3853d83567d6e9ef8d
download/xorg-server-1.6.1-duplicate_headers.patch
30bb0607dd403b96dbf4b2589878cf57 download/xorg-server-1.6.1-xdmcp.patch
06c5528e36e5e3d58db96bfeca969de6 download/xorg-server-1.6.1-perl.patch.gar
4cb2f868f6b61fe70cb1e11254c44bf8
download/xorg-server-1.6.1-pkg_config.patch
Added:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.1-duplicate_headers.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.1-duplicate_headers.patch
Wed Jun 24 09:45:58 2009
@@ -0,0 +1,33 @@
+diff -Naur xorg-server-1.6.1-old/hw/xfree86/common/Makefile.am
xorg-server-1.6.1-new/hw/xfree86/common/Makefile.am
+--- xorg-server-1.6.1-old/hw/xfree86/common/Makefile.am 2009-04-14
10:14:57.000000000 -0700
++++ xorg-server-1.6.1-new/hw/xfree86/common/Makefile.am 2009-06-24
09:31:55.000000000 -0700
+@@ -7,7 +7,7 @@
+
+ if XV
+ XVSOURCES = xf86xv.c xf86xvmc.c
+-XVSDKINCS = xf86xv.h xf86xvmc.h
++XVSDKINCS = xf86xv.h xf86xvmc.h xf86xvpriv.h
+ endif
+
+ XISOURCES = xf86Xinput.c xisb.c
+@@ -47,7 +47,7 @@
+ xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
+ xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h
xisb.h \
+ $(XVSDKINCS) xorgVersion.h \
+- xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
++ xf86sbusBus.h
+
+ DISTCLEANFILES = xf86Build.h
+ CLEANFILES = $(BUILT_SOURCES)
+diff -Naur xorg-server-1.6.1-old/hw/xfree86/parser/Makefile.am
xorg-server-1.6.1-new/hw/xfree86/parser/Makefile.am
+--- xorg-server-1.6.1-old/hw/xfree86/parser/Makefile.am 2009-04-14
10:14:57.000000000 -0700
++++ xorg-server-1.6.1-new/hw/xfree86/parser/Makefile.am 2009-06-24
09:39:23.000000000 -0700
+@@ -35,6 +35,5 @@
+ xf86tokens.h
+
+ sdk_HEADERS = \
+- $(LIBHEADERS) \
+- xf86Parser.h \
+- xf86Optrec.h
++ xf86Optrec.h \
++ xf86Parser.h
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
