From 01518ada4b0ca1571f4b4d21c884b02e9371da62 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Nov 2010 10:08:00 +0000 Subject: meta-emenlow: Rename packages to recipes in line with main repository Signed-off-by: Richard Purdie --- .../packages/xorg-xserver/files/crosscompile.patch | 19 ---------------- .../files/fix_open_max_preprocessor_error.patch | 13 ----------- .../xorg-xserver/files/libdrm-poulsbo.patch | 26 ---------------------- .../packages/xorg-xserver/files/macro_tweak.patch | 18 --------------- .../packages/xorg-xserver/files/nodolt.patch | 12 ---------- .../packages/xorg-xserver/xserver-psb_1.7.99.2.bb | 21 ----------------- .../xserver-xf86-config/emenlow/xorg.conf | 13 ----------- .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 3 --- 8 files changed, 125 deletions(-) delete mode 100644 meta-emenlow/packages/xorg-xserver/files/crosscompile.patch delete mode 100644 meta-emenlow/packages/xorg-xserver/files/fix_open_max_preprocessor_error.patch delete mode 100644 meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch delete mode 100644 meta-emenlow/packages/xorg-xserver/files/macro_tweak.patch delete mode 100644 meta-emenlow/packages/xorg-xserver/files/nodolt.patch delete mode 100644 meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb delete mode 100644 meta-emenlow/packages/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf delete mode 100644 meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend (limited to 'meta-emenlow/packages/xorg-xserver') diff --git a/meta-emenlow/packages/xorg-xserver/files/crosscompile.patch b/meta-emenlow/packages/xorg-xserver/files/crosscompile.patch deleted file mode 100644 index 2341e40bc..000000000 --- a/meta-emenlow/packages/xorg-xserver/files/crosscompile.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: xorg-server-1.7.99.2/configure.ac -=================================================================== ---- xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.000000000 +0000 -+++ xorg-server-1.7.99.2/configure.ac 2010-01-29 16:42:39.000000000 +0000 -@@ -503,14 +503,10 @@ - - dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, - dnl otherwise uses standard subdirectories of FONTROOTDIR --AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], -- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], -- [ - DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" - case $host_os in - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; - esac -- ]) - AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), - [ FONTPATH="$withval" ], - [ FONTPATH="${DEFAULT_FONT_PATH}" ]) diff --git a/meta-emenlow/packages/xorg-xserver/files/fix_open_max_preprocessor_error.patch b/meta-emenlow/packages/xorg-xserver/files/fix_open_max_preprocessor_error.patch deleted file mode 100644 index 565832eed..000000000 --- a/meta-emenlow/packages/xorg-xserver/files/fix_open_max_preprocessor_error.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/os/osdep.h -=================================================================== ---- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100 -+++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100 -@@ -92,7 +92,7 @@ - * like sysconf(_SC_OPEN_MAX) is not supported. - */ - --#if OPEN_MAX <= 256 -+#if 0 - #define MAXSOCKS (OPEN_MAX - 1) - #else - #define MAXSOCKS 256 diff --git a/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch b/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch deleted file mode 100644 index b604cab7c..000000000 --- a/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch +++ /dev/null @@ -1,26 +0,0 @@ -# Make the server depend on libdrm-poulsbo instead of libdrm so that the -# emenlow libdrm can coexist with the normal libdrm. -# jdike@linux.intel.com - -Index: xorg-server-1.7.99.2/configure.ac -=================================================================== ---- xorg-server-1.7.99.2.orig/configure.ac -+++ xorg-server-1.7.99.2/configure.ac -@@ -763,7 +763,7 @@ dnl List of libraries that require a spe - LIBAPPLEWM="applewm >= 1.4" - LIBDMX="dmx >= 1.0.99.1" - LIBDRI="dri >= 7.1.0" --LIBDRM="libdrm >= 2.3.0" -+LIBDRM="libdrm_poulsbo >= 2.3.0" - LIBGL="gl >= 7.1.0" - LIBXEXT="xext >= 1.0.99.4" - LIBXI="xi >= 1.2.99.1" -@@ -2002,7 +2002,7 @@ if test "$KDRIVE" = yes; then - XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv" - fi - if test "x$DRI" = xyes && test "x$GLX" = xyes; then -- XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm" -+ XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm_poulsbo" - fi - - PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"]) diff --git a/meta-emenlow/packages/xorg-xserver/files/macro_tweak.patch b/meta-emenlow/packages/xorg-xserver/files/macro_tweak.patch deleted file mode 100644 index 6998adffe..000000000 --- a/meta-emenlow/packages/xorg-xserver/files/macro_tweak.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: xorg-server-1.5.0/xorg-server.m4 -=================================================================== ---- xorg-server-1.5.0.orig/xorg-server.m4 2007-05-29 20:36:51.000000000 +0100 -+++ xorg-server-1.5.0/xorg-server.m4 2008-11-04 23:56:55.000000000 +0000 -@@ -28,9 +28,12 @@ - # Checks for the $1 define in xorg-server.h (from the sdk). If it - # is defined, then add $1 to $REQUIRED_MODULES. - -+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) -+ - AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ -+ PKG_PROG_PKG_CONFIG - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" -+ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`pkg-config --variable=sdkdir xorg-server`" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "xorg-server.h" - #if !defined $1 diff --git a/meta-emenlow/packages/xorg-xserver/files/nodolt.patch b/meta-emenlow/packages/xorg-xserver/files/nodolt.patch deleted file mode 100644 index 6b34032a3..000000000 --- a/meta-emenlow/packages/xorg-xserver/files/nodolt.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000 -+++ git/configure.ac 2009-01-15 20:35:38.000000000 +0000 -@@ -62,7 +62,6 @@ - AC_LIBTOOL_WIN32_DLL - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --DOLT - AC_PROG_MAKE_SET - PKG_PROG_PKG_CONFIG - AC_PROG_LEX diff --git a/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb b/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb deleted file mode 100644 index 5227faa45..000000000 --- a/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc - -PR = "r3" - -PROTO_DEPS += "xf86driproto dri2proto" - -DEPENDS += "font-util" - -SRC_URI += "file://nodolt.patch \ - file://crosscompile.patch \ - file://libdrm-poulsbo.patch" - -# Misc build failure for master HEAD -SRC_URI += "file://fix_open_max_preprocessor_error.patch" - -EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga --enable-glx" - -RDEPENDS_${PN} += "xserver-xorg-video-psb psb-firmware xpsb-glx \ - libdrm-poulsbo libva" - -COMPATIBLE_MACHINE = "emenlow" diff --git a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf deleted file mode 100644 index 684626383..000000000 --- a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf +++ /dev/null @@ -1,13 +0,0 @@ -Section "ServerFlags" - Option "AutoAddDevices" "False" -EndSection - -Section "Device" - Identifier "Configured Video Device" - Driver "psb" - Option "ShadowFB" "False" -EndSection - -Section "DRI" - Mode 0666 -EndSection diff --git a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend deleted file mode 100644 index 4b8d0e656..000000000 --- a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" - -- cgit v1.2.3