From 0071b9d33c19f61dc0ffea0efaeae51eede6e00f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Mar 2010 22:25:56 +0200 Subject: [PATCH 1/7] Mesa: - update to Mesa-7.7.1 --- .../Mesa/patches/110_fix-libkms-api.diff | 40 ------------------- packages/graphics/Mesa/url | 4 +- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 packages/graphics/Mesa/patches/110_fix-libkms-api.diff diff --git a/packages/graphics/Mesa/patches/110_fix-libkms-api.diff b/packages/graphics/Mesa/patches/110_fix-libkms-api.diff deleted file mode 100644 index cea46b01fe..0000000000 --- a/packages/graphics/Mesa/patches/110_fix-libkms-api.diff +++ /dev/null @@ -1,40 +0,0 @@ -From 8db8adfd01a1ff1e2a160ae3b0199bd3daa4191a Mon Sep 17 00:00:00 2001 -From: Jakob Bornecrantz -Date: Thu, 28 Jan 2010 16:59:26 +0000 -Subject: st/xorg: Update to new libkms interface but be backwards compatible - ---- -diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c -index 0160b1a..daa9f8b 100644 ---- a/src/gallium/state_trackers/xorg/xorg_crtc.c -+++ b/src/gallium/state_trackers/xorg/xorg_crtc.c -@@ -243,7 +243,11 @@ crtc_load_cursor_argb_kms(xf86CrtcPtr crtc, CARD32 * image) - unsigned attr[8]; - - attr[0] = KMS_BO_TYPE; -+#ifdef KMS_BO_TYPE_CURSOR_64X64_A8R8G8B8 -+ attr[1] = KMS_BO_TYPE_CURSOR_64X64_A8R8G8B8; -+#else - attr[1] = KMS_BO_TYPE_CURSOR; -+#endif - attr[2] = KMS_WIDTH; - attr[3] = 64; - attr[4] = KMS_HEIGHT; -diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c -index e4ad789..f53a879 100644 ---- a/src/gallium/state_trackers/xorg/xorg_driver.c -+++ b/src/gallium/state_trackers/xorg/xorg_driver.c -@@ -1008,7 +1008,11 @@ drv_create_front_buffer_kms(ScrnInfoPtr pScrn) - int ret; - - attr[0] = KMS_BO_TYPE; -+#ifdef KMS_BO_TYPE_SCANOUT_X8R8G8B8 -+ attr[1] = KMS_BO_TYPE_SCANOUT_X8R8G8B8; -+#else - attr[1] = KMS_BO_TYPE_SCANOUT; -+#endif - attr[2] = KMS_WIDTH; - attr[3] = pScrn->virtualX; - attr[4] = KMS_HEIGHT; --- -cgit v0.8.3-6-g21f6 diff --git a/packages/graphics/Mesa/url b/packages/graphics/Mesa/url index 162dcaf14a..d0aecb9798 100644 --- a/packages/graphics/Mesa/url +++ b/packages/graphics/Mesa/url @@ -1,2 +1,2 @@ -ftp://ftp.freedesktop.org/pub/mesa/7.7/MesaLib-7.7.tar.bz2 -ftp://ftp.freedesktop.org/pub/mesa/7.7/MesaDemos-7.7.tar.bz2 \ No newline at end of file +ftp://ftp.freedesktop.org/pub/mesa/7.7.1/MesaLib-7.7.1.tar.bz2 +ftp://ftp.freedesktop.org/pub/mesa/7.7.1/MesaDemos-7.7.1.tar.bz2 \ No newline at end of file From a75728d913824529abe47dcc32e61d1368d1c41d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Mar 2010 22:26:15 +0200 Subject: [PATCH 2/7] connman: - cleanup --- packages/network/connman/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/network/connman/install b/packages/network/connman/install index 315ed3138e..3e093f0855 100755 --- a/packages/network/connman/install +++ b/packages/network/connman/install @@ -15,13 +15,13 @@ add_user system x 430 430 "service" "/var/run/connman" "/bin/sh" add_group system 430 mkdir -p $INSTALL/usr/sbin - cp -PR $PKG_BUILD/src/connmand $INSTALL/usr/sbin + cp -P $PKG_BUILD/src/connmand $INSTALL/usr/sbin mkdir -p $INSTALL/usr/lib/connman/plugins - cp -PR $PKG_BUILD/plugins/.libs/*.so $INSTALL/usr/lib/connman/plugins + cp -P $PKG_BUILD/plugins/.libs/*.so $INSTALL/usr/lib/connman/plugins mkdir -p $INSTALL/usr/lib/connman/scripts - cp -PR $PKG_BUILD/scripts/udhcpc-script $INSTALL/usr/lib/connman/scripts + cp -P $PKG_BUILD/scripts/udhcpc-script $INSTALL/usr/lib/connman/scripts mkdir -p $INSTALL/etc/dbus-1/system.d - cp -PR $PKG_BUILD/src/connman-dbus.conf $INSTALL/etc/dbus-1/system.d + cp -P $PKG_BUILD/src/connman-dbus.conf $INSTALL/etc/dbus-1/system.d From e6567f67cc97626c5885b8b9dd84fdf1ab47699d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Mar 2010 22:26:35 +0200 Subject: [PATCH 3/7] binutils: - update to binutils-2.20.51.0.7 --- packages/toolchain/devel/binutils/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolchain/devel/binutils/url b/packages/toolchain/devel/binutils/url index 2175177c56..d5954ddf71 100644 --- a/packages/toolchain/devel/binutils/url +++ b/packages/toolchain/devel/binutils/url @@ -1 +1 @@ -ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-2.20.51.0.6.tar.bz2 \ No newline at end of file +ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-2.20.51.0.7.tar.bz2 \ No newline at end of file From 2d645a2e8e3999b1ca6c48c1d4146668b1408bc2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Mar 2010 22:27:35 +0200 Subject: [PATCH 4/7] binutils: - add patch from buildroot for ARM EABI configuration --- .../binutils/patches/110-arm-eabi-conf.diff | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 packages/toolchain/devel/binutils/patches/110-arm-eabi-conf.diff diff --git a/packages/toolchain/devel/binutils/patches/110-arm-eabi-conf.diff b/packages/toolchain/devel/binutils/patches/110-arm-eabi-conf.diff new file mode 100644 index 0000000000..af26329d90 --- /dev/null +++ b/packages/toolchain/devel/binutils/patches/110-arm-eabi-conf.diff @@ -0,0 +1,24 @@ +diff -rdup binutils-2.18.50.0.3.orig/configure binutils-2.18.50.0.3/configure +--- binutils-2.18.50.0.3.orig/configure 2007-11-22 12:41:26.000000000 +0100 ++++ binutils-2.18.50.0.3/configure 2007-11-22 12:45:01.000000000 +0100 +@@ -2245,7 +2245,7 @@ case "${target}" in + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + libgloss_dir=arm + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-*gnueabi) + noconfigdirs="$noconfigdirs target-qthreads" + noconfigdirs="$noconfigdirs target-libobjc" + case ${with_newlib} in +diff -rdup binutils-2.18.50.0.3.orig/configure.ac binutils-2.18.50.0.3/configure.ac +--- binutils-2.18.50.0.3.orig/configure.ac 2007-11-22 12:41:26.000000000 +0100 ++++ binutils-2.18.50.0.3/configure.ac 2007-11-22 12:44:54.000000000 +0100 +@@ -522,7 +522,7 @@ case "${target}" in + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + libgloss_dir=arm + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-*gnueabi) + noconfigdirs="$noconfigdirs target-qthreads" + noconfigdirs="$noconfigdirs target-libobjc" + case ${with_newlib} in From f086750073ff0e21d39923e8c0f7c0f05634761d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Mar 2010 22:28:56 +0200 Subject: [PATCH 5/7] uxlaunch: - start mrxvt if mrxvt is installed --- packages/x11/other/uxlaunch/init.d/60_uxlaunch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/other/uxlaunch/init.d/60_uxlaunch b/packages/x11/other/uxlaunch/init.d/60_uxlaunch index 9a6c152514..9ca440f3d3 100644 --- a/packages/x11/other/uxlaunch/init.d/60_uxlaunch +++ b/packages/x11/other/uxlaunch/init.d/60_uxlaunch @@ -9,7 +9,7 @@ progress "starting uxlaunch" XORG_CONF="/etc/X11/xorg.conf" XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf" - if [ "$START_MRXVT" = "yes" ]; then + if [ "$START_MRXVT" = "yes" -a -f /usr/bin/mrxvt-session ]; then UX_SESSION="/usr/bin/mrxvt-session" else UX_SESSION="/usr/bin/xbmc-session" From bca13dda780ff2e0be7c9571ca871bfd96d0bbe1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Mar 2010 22:29:29 +0200 Subject: [PATCH 6/7] xorg-server: - add an empty line (cosmetics) --- packages/x11/xserver/xorg-server/install | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index 9b1c80a07b..34b0deaa32 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -82,3 +82,4 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/ #Tools $SCRIPTS/install pciutils $SCRIPTS/install uxlaunch + From bc371a13c43f069d95b78e73920ccab1ee044115 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Mar 2010 22:29:53 +0200 Subject: [PATCH 7/7] xf86-video-intel: - update to xf86-video-intel-2.11.0 --- packages/x11/driver/xf86-video-intel/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/url b/packages/x11/driver/xf86-video-intel/url index 99bc71fafb..c0c411ea8d 100644 --- a/packages/x11/driver/xf86-video-intel/url +++ b/packages/x11/driver/xf86-video-intel/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.10.903.tar.bz2 \ No newline at end of file +http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.11.0.tar.bz2