[oe-commits] org.oe.dev xserver-kdrive: clean up different patch versions, drop imageon from 1.2 for now
pH5 commit
openembedded-commits at lists.openembedded.org
Thu Mar 29 10:15:33 UTC 2007
xserver-kdrive: clean up different patch versions, drop imageon from 1.2 for now
Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 8e23de0b28709b8a6c57f7457df5625d8657e4f1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8e23de0b28709b8a6c57f7457df5625d8657e4f1
Files:
1
packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch
packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch
packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch
packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch
packages/xorg-xserver/xserver-kdrive-1.2
packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch
packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch
packages/xorg-xserver/xserver-kdrive-common.inc
packages/xorg-xserver/xserver-kdrive_1.2.0.bb
packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
Diffs:
#
# mt diff -r7fa457f0b3692dd1829c417e2b50813397a844a7 -r8e23de0b28709b8a6c57f7457df5625d8657e4f1
#
#
#
# rename "packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch"
# to "packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch"
#
# rename "packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch"
# to "packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch"
#
# add_dir "packages/xorg-xserver/xserver-kdrive-1.2"
#
# add_file "packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch"
# content [0e180743b0d3d394a3accf82bcd7e4a84851da4a]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch"
# content [14d4d09c37970d1ee9123881789fd868ab321f55]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch"
# content [edd4fbc670386b5401e07e8fd52d20f28df7603d]
#
# patch "packages/xorg-xserver/xserver-kdrive-common.inc"
# from [07d219ec2bc3391bbe0de34c07bea8238a835c2b]
# to [75767771944edd771c61ae5291477e91e379c9b9]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.2.0.bb"
# from [7c191cbc58ddc786d9412a448c799dde4a56662e]
# to [7e4e534bb7d7e4177aa337c70e46296d288b9538]
#
# patch "packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb"
# from [ba918bb64dc2a5b259c3ceb67a6a4d59b13b8e9e]
# to [f01030476ed78a3170ace7b66616d971ccd54ea0]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch 0e180743b0d3d394a3accf82bcd7e4a84851da4a
+++ packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch 0e180743b0d3d394a3accf82bcd7e4a84851da4a
@@ -0,0 +1,18 @@
+Index: git/composite/compext.c
+===================================================================
+--- git.orig/composite/compext.c 2007-03-28 16:25:12.000000000 +0200
++++ git/composite/compext.c 2007-03-28 16:25:15.000000000 +0200
+@@ -696,11 +696,13 @@
+ if (GetPictureScreenIfSet(pScreen) == NULL)
+ return;
+ }
++#ifdef PANORAMIX
+ /* Xinerama's rewriting of window drawing before Composite gets to it
+ * breaks Composite.
+ */
+ if (!noPanoramiXExtension)
+ return;
++#endif
+
+ CompositeClientWindowType = CreateNewResourceType (FreeCompositeClientWindow);
+ if (!CompositeClientWindowType)
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch 14d4d09c37970d1ee9123881789fd868ab321f55
+++ packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch 14d4d09c37970d1ee9123881789fd868ab321f55
@@ -0,0 +1,28 @@
+Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am
+===================================================================
+--- xorg-server-1.2.0.orig/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:24.000000000 +0200
++++ xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:27.000000000 +0200
+@@ -6,6 +6,10 @@
+
+ bin_PROGRAMS = Xfbdev
+
++if TSLIB
++TSLIB_FLAG = -lts
++endif
++
+ libfbdev_a_SOURCES = \
+ fbdev.c \
+ fbdev.h
+@@ -16,7 +20,10 @@
+ Xfbdev_LDADD = \
+ libfbdev.a \
+ @KDRIVE_LIBS@ \
+- @XSERVER_LIBS@
++ @XSERVER_LIBS@ \
++ $(TSLIB_FLAG)
+
+ Xfbdev_DEPENDENCIES = \
+- libfbdev.a
++ libfbdev.a \
++ @KDRIVE_LIBS@
++
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch edd4fbc670386b5401e07e8fd52d20f28df7603d
+++ packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch edd4fbc670386b5401e07e8fd52d20f28df7603d
@@ -0,0 +1,24 @@
+Index: xorg-server-1.2.0/mi/miinitext.c
+===================================================================
+--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-03-29 11:32:40.000000000 +0200
++++ xorg-server-1.2.0/mi/miinitext.c 2007-03-29 11:33:22.000000000 +0200
+@@ -372,6 +372,9 @@
+ #ifdef DMXEXT
+ extern void DMXExtensionInit(INITARGS);
+ #endif
++#ifdef XCALIBRATE
++extern void XCalibrateExtensionInit(INITARGS);
++#endif
+ #ifdef XEVIE
+ extern void XevieExtensionInit(INITARGS);
+ #endif
+@@ -663,6 +666,9 @@
+ #ifdef DAMAGE
+ if (!noDamageExtension) DamageExtensionInit();
+ #endif
++#ifdef XCALIBRATE
++ XCalibrateExtensionInit ();
++#endif
+ }
+
+ void
============================================================
--- packages/xorg-xserver/xserver-kdrive-common.inc 07d219ec2bc3391bbe0de34c07bea8238a835c2b
+++ packages/xorg-xserver/xserver-kdrive-common.inc 75767771944edd771c61ae5291477e91e379c9b9
@@ -96,7 +96,10 @@ KDRIVE_COMMON_PATCHES = " \
file://kdrive-use-evdev.patch;patch=1 \
file://fbdev-not-fix.patch;patch=1 \
file://enable-builtin-fonts.patch;patch=1 \
+ file://disable-xf86-dga-xorgcfg.patch;patch=1 \
file://optional-xkb.patch;patch=1 \
+ file://enable-epson.patch;patch=1 \
+ file://enable-tslib.patch;patch=1 \
file://kmode-palm.patch;patch=1 \
"
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.2.0.bb 7c191cbc58ddc786d9412a448c799dde4a56662e
+++ packages/xorg-xserver/xserver-kdrive_1.2.0.bb 7e4e534bb7d7e4177aa337c70e46296d288b9538
@@ -1,21 +1,14 @@ PE = "1"
require xserver-kdrive-common.inc
DEPENDS += "libxkbfile libxcalibrate"
PE = "1"
-PR = "r1"
+PR = "r2"
-PACKAGES =+ "xserver-kdrive-imageon"
-
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
- file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \
- file://enable-epson-1.2.patch;patch=1 \
- file://kdrive-vidmemarea.patch;patch=1 \
- file://kdrive-imageon.patch;patch=1 \
+ file://enable-xcalibrate.patch;patch=1 \
"
S = "${WORKDIR}/xorg-server-${PV}"
-IMAGEON_OECONF = "--disable-imageon"
-IMAGEON_OECONF_arm = "--enable-imageon"
============================================================
--- packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb ba918bb64dc2a5b259c3ceb67a6a4d59b13b8e9e
+++ packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb f01030476ed78a3170ace7b66616d971ccd54ea0
@@ -8,10 +8,7 @@ SRC_URI = "${XORG_MIRROR}/X11R7.1/src/xs
SRC_URI = "${XORG_MIRROR}/X11R7.1/src/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
- file://disable-xf86-dga-xorgcfg.patch;patch=1 \
file://xcalibrate.patch;patch=1 \
- file://enable-epson.patch;patch=1 \
- file://enable-tslib.patch;patch=1 \
file://w100.patch;patch=1 \
"
More information about the Openembedded-commits
mailing list