Author: pebender
Date: Wed Jun 24 08:14:58 2009
New Revision: 5046
Added:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.1-xv_sdk_includes.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/xorg-7.4/xorg-server/Makefile
trunk/gar-minimyth/script/xorg-7.4/xorg-server/checksums
Log:
- Patched xorg-7.4/xorg-server so that it does not contain duplicate
entries in Makefile.am as the duplicate entries cause a problem with
automake 1.11.
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 Wed Jun 24
08:14:58 2009
@@ -93,6 +93,9 @@
- Patched net/ntp so that it builds with glibc 2.10.
- Patched net/openssh so that it uses an abstract namespace socket when
attempting to connect to the X server.
+ - Patched xorg-7.4/xorg-server so that it does not contain duplicate
+ entries in Makefile.am as the duplicate entries cause a problem with
+ automake 1.11.
Removed packages
Removed kernel-2.6.26/linux.
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
08:14:58 2009
@@ -4,6 +4,7 @@
MASTER_SITES = $(XORG_MASTER_SITES)
DISTFILES = $(DISTNAME).tar.bz2
PATCHFILES = \
+ $(DISTNAME)-xv_sdk_includes.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
08:14:58 2009
@@ -1,4 +1,5 @@
ed0878bf32a24d4948c3b8a122a39eff download/xorg-server-1.6.1.tar.bz2
+b397f26a7bac3b0738c01b5956dbb70e
download/xorg-server-1.6.1-xv_sdk_includes.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-xv_sdk_includes.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.1-xv_sdk_includes.patch
Wed Jun 24 08:14:58 2009
@@ -0,0 +1,21 @@
+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
07:03:15.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)
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
