[oe-commits] org.oe.dev merge of '5de580abb15ee7230f7162ca138cac8c1c1dba23'

pfalcon commit openembedded-commits at lists.openembedded.org
Sat Sep 8 11:05:09 UTC 2007 

merge of '5de580abb15ee7230f7162ca138cac8c1c1dba23'
     and 'c2df40f19e8788bf21437d463d250244cd5c8d4b'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: fc667f37f1c211961e93bb0db9d7c7324861e831
ViewMTN: http://monotone.openembedded.org/revision/info/fc667f37f1c211961e93bb0db9d7c7324861e831
Files:
1
packages/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch
packages/xorg-xserver/xserver-kdrive/w100-autofoo.patch
packages/xorg-xserver/xserver-kdrive/w100.patch
packages/xorg-xserver/xserver-kdrive_1.2.0.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
Diffs:

#
# mt diff -r5de580abb15ee7230f7162ca138cac8c1c1dba23 -rfc667f37f1c211961e93bb0db9d7c7324861e831
#
# 
# 
# delete "packages/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch"
# 
# add_file "packages/xorg-xserver/xserver-kdrive/w100-autofoo.patch"
#  content [57abbc0692fd1d555d9a4415b8b32874e2fa6856]
# 
# patch "packages/xorg-xserver/xserver-kdrive/w100.patch"
#  from [0dc0af956140187d39a116a70f71c42db605b00b]
#    to [a7f0fd47571239758e6d509c7ac7a660753c8b3a]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.2.0.bb"
#  from [5d4c1648cee1599f242309505ed0ccb3ea412b96]
#    to [bdd727e7b87cdcef8b2df5c9ee7f48271999900c]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
#  from [ac40a8d7e0dff290e512317059626ae16986ffef]
#    to [792ae3a3ba391da0e6b49555e228e96517577637]
# 
============================================================
--- packages/xorg-xserver/xserver-kdrive/w100-autofoo.patch	57abbc0692fd1d555d9a4415b8b32874e2fa6856
+++ packages/xorg-xserver/xserver-kdrive/w100-autofoo.patch	57abbc0692fd1d555d9a4415b8b32874e2fa6856
@@ -0,0 +1,54 @@
+Index: git/hw/kdrive/Makefile.am
+===================================================================
+--- git.orig/hw/kdrive/Makefile.am	2006-09-02 12:12:13.000000000 +0200
++++ git/hw/kdrive/Makefile.am	2006-09-02 12:12:14.000000000 +0200
+@@ -7,6 +7,10 @@
+ FBDEV_SUBDIRS = fbdev epson
+ endif
+ 
++if KDRIVEW100
++W100_SUBDIRS = w100
++endif
++
+ if XSDLSERVER
+ XSDL_SUBDIRS = sdl
+ endif
+@@ -20,6 +24,7 @@
+ 	linux			\
+ 	$(XSDL_SUBDIRS)		\
+ 	$(FBDEV_SUBDIRS)	\
++	$(W100_SUBDIRS)		\
+ 	$(VESA_SUBDIRS)		\
+ 	$(XEPHYR_SUBDIRS)       \
+ 	fake
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac	2006-09-02 12:12:14.000000000 +0200
++++ git/configure.ac	2006-09-02 12:12:14.000000000 +0200
+@@ -442,6 +442,7 @@
+ AC_ARG_ENABLE(kdrive,         AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
+ AC_ARG_ENABLE(xephyr,         AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
+ AC_ARG_ENABLE(xsdl,           AS_HELP_STRING([--enable-xsdl], [Build the kdrive Xsdl server (default: auto)]), [XSDL=$enableval], [XSDL=auto])
++AC_ARG_ENABLE(w100,           AS_HELP_STRING([--enable-w100], [Build the kdrive Xw100 server (default: no)]), [KDRIVEW100=$enableval], [KDRIVEW100=no])
+ dnl xprint
+ AC_ARG_ENABLE(freetype,       AS_HELP_STRING([ --enable-freetype], [Build Xprint FreeType backend (default: yes)]), [XP_USE_FREETYPE=$enableval],[XP_USE_FREETYPE=no])
+ AC_ARG_WITH(freetype-config,  AS_HELP_STRING([ --with-freetype-config=PROG], [Use FreeType configuration program PROG (default: auto)]), freetype_config=$withval, freetype_config=auto)
+@@ -1519,6 +1520,10 @@
+ AC_SUBST([XSDL_LIBS])
+ AC_SUBST([XSDL_INCS])
+ 
++AM_CONDITIONAL(KDRIVEW100, [test "x$KDRIVEW100" = xyes])
++if test "x$KDRIVEW100" = xyes; then
++        AC_DEFINE(KDRIVEW100, 1, [Build Xw100 server])
++fi
+ 
+ dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers)
+ AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules])
+@@ -1753,6 +1758,7 @@
+ hw/kdrive/epson/Makefile
+ hw/kdrive/fake/Makefile
+ hw/kdrive/fbdev/Makefile
++hw/kdrive/w100/Makefile
+ hw/kdrive/i810/Makefile
+ hw/kdrive/linux/Makefile
+ hw/kdrive/mach64/Makefile
============================================================
--- packages/xorg-xserver/xserver-kdrive/w100.patch	0dc0af956140187d39a116a70f71c42db605b00b
+++ packages/xorg-xserver/xserver-kdrive/w100.patch	a7f0fd47571239758e6d509c7ac7a660753c8b3a
@@ -6332,57 +6332,4 @@ Index: git/hw/kdrive/w100/w100_regs.h
 +
 +
 +#endif //_W100_REGS_H_
+
-Index: git/hw/kdrive/Makefile.am
-===================================================================
---- git.orig/hw/kdrive/Makefile.am	2006-09-02 12:12:13.000000000 +0200
-+++ git/hw/kdrive/Makefile.am	2006-09-02 12:12:14.000000000 +0200
-@@ -7,6 +7,10 @@
- FBDEV_SUBDIRS = fbdev epson
- endif
- 
-+if KDRIVEW100
-+W100_SUBDIRS = w100
-+endif
-+
- if XSDLSERVER
- XSDL_SUBDIRS = sdl
- endif
-@@ -20,6 +24,7 @@
- 	linux			\
- 	$(XSDL_SUBDIRS)		\
- 	$(FBDEV_SUBDIRS)	\
-+	$(W100_SUBDIRS)		\
- 	$(VESA_SUBDIRS)		\
- 	$(XEPHYR_SUBDIRS)       \
- 	fake
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac	2006-09-02 12:12:14.000000000 +0200
-+++ git/configure.ac	2006-09-02 12:12:14.000000000 +0200
-@@ -442,6 +442,7 @@
- AC_ARG_ENABLE(kdrive,         AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
- AC_ARG_ENABLE(xephyr,         AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
- AC_ARG_ENABLE(xsdl,           AS_HELP_STRING([--enable-xsdl], [Build the kdrive Xsdl server (default: auto)]), [XSDL=$enableval], [XSDL=auto])
-+AC_ARG_ENABLE(w100,           AS_HELP_STRING([--enable-w100], [Build the kdrive Xw100 server (default: no)]), [KDRIVEW100=$enableval], [KDRIVEW100=no])
- dnl xprint
- AC_ARG_ENABLE(freetype,       AS_HELP_STRING([ --enable-freetype], [Build Xprint FreeType backend (default: yes)]), [XP_USE_FREETYPE=$enableval],[XP_USE_FREETYPE=no])
- AC_ARG_WITH(freetype-config,  AS_HELP_STRING([ --with-freetype-config=PROG], [Use FreeType configuration program PROG (default: auto)]), freetype_config=$withval, freetype_config=auto)
-@@ -1519,6 +1520,10 @@
- AC_SUBST([XSDL_LIBS])
- AC_SUBST([XSDL_INCS])
- 
-+AM_CONDITIONAL(KDRIVEW100, [test "x$KDRIVEW100" = xyes])
-+if test "x$KDRIVEW100" = xyes; then
-+        AC_DEFINE(KDRIVEW100, 1, [Build Xw100 server])
-+fi
- 
- dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers)
- AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules])
-@@ -1753,6 +1758,7 @@
- hw/kdrive/epson/Makefile
- hw/kdrive/fake/Makefile
- hw/kdrive/fbdev/Makefile
-+hw/kdrive/w100/Makefile
- hw/kdrive/i810/Makefile
- hw/kdrive/linux/Makefile
- hw/kdrive/mach64/Makefile
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.2.0.bb	5d4c1648cee1599f242309505ed0ccb3ea412b96
+++ packages/xorg-xserver/xserver-kdrive_1.2.0.bb	bdd727e7b87cdcef8b2df5c9ee7f48271999900c
@@ -12,6 +12,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
 	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
 	file://enable-xcalibrate.patch;patch=1 \
         file://w100.patch;patch=1 \
+        file://w100-autofoo.patch;patch=1 \
         file://w100-fix-offscreen-bmp.patch;patch=1 \
         file://fbcompositesrc8888revnpx0565.patch;patch=1 \
         file://xcalibrate_coords.patch;patch=1 \
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb	ac40a8d7e0dff290e512317059626ae16986ffef
+++ packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb	792ae3a3ba391da0e6b49555e228e96517577637
@@ -15,6 +15,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
 	file://hide-cursor-and-ppm-root.patch;patch=1 \
 	file://xcalibrate_coords.patch;patch=1 \
 	file://w100.patch;patch=1 \
+	file://w100-autofoo.patch;patch=1 \
 	file://w100-fix-offscreen-bmp.patch;patch=1 \
 	"
 


#
# mt diff -rc2df40f19e8788bf21437d463d250244cd5c8d4b -rfc667f37f1c211961e93bb0db9d7c7324861e831
#
# 
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
#  from [8f55f797530543ed03879154d629e4fcd64228a6]
#    to [792ae3a3ba391da0e6b49555e228e96517577637]
# 
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb	8f55f797530543ed03879154d629e4fcd64228a6
+++ packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb	792ae3a3ba391da0e6b49555e228e96517577637
@@ -1,9 +1,9 @@ PE = "1"
 require xserver-kdrive-common.inc
 
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r16"
+PR = "r17"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \

More information about the Openembedded-commits mailing list