From 88a1a52d68a6a29b2ec8e627ef15827d959dd27c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 21 Jul 2011 18:40:03 +0200 Subject: [PATCH 1/8] xf86-video-fglrx: install amdpcsdb again, disable underscan Signed-off-by: Stephan Raue --- .../driver/xf86-video-fglrx/config/amdpcsdb | 35 ---------------- .../xf86-video-fglrx/config/amdpcsdb.bk | 41 +++++++++++++++++++ packages/x11/driver/xf86-video-fglrx/install | 3 +- 3 files changed, 42 insertions(+), 37 deletions(-) create mode 100644 packages/x11/driver/xf86-video-fglrx/config/amdpcsdb.bk diff --git a/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb b/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb index 6622412edf..423e0193ca 100644 --- a/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb +++ b/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb @@ -4,38 +4,3 @@ DigitalHDTVDefaultUnderscan=V0 [AMDPCSROOT/SYSTEM/DDX] EnableTearFreeDesktop=V1 -OGLFMTA2R10G10B10Enable=V1 -VideoOverlay=Soff -OpenGLOverlay=Soff -TexturedVideo=Son -TexturedVideoSync=Son - -[AMDPCSROOT/SYSTEM/2ID-1002-9802-0/OpenGL] -VSyncControl=V3 - -[AMDPCSROOT/SYSTEM/2ID-1002-9803-0/OpenGL] -VSyncControl=V3 - -[AMDPCSROOT/SYSTEM/2ID-1002-9804-0/OpenGL] -VSyncControl=V3 - -[AMDPCSROOT/SYSTEM/2ID-1002-9805-0/OpenGL] -VSyncControl=V3 - -[AMDPCSROOT/SYSTEM/2ID-1002-9802-0/LDC] -GammaChannelSelState=V0 - -[AMDPCSROOT/SYSTEM/2ID-1002-9803-0/LDC] -GammaChannelSelState=V0 - -[AMDPCSROOT/SYSTEM/2ID-1002-9804-0/LDC] -GammaChannelSelState=V0 - -[AMDPCSROOT/SYSTEM/2ID-1002-9805-0/LDC] -GammaChannelSelState=V0 - -[AMDPCSROOT/SYSTEM/2ID-1002-980-0/LDC] -GammaChannelSelState=V0 - -[AMDPCSROOT/SYSTEM/LDC] -ColorPreviewDlgState=V0 \ No newline at end of file diff --git a/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb.bk b/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb.bk new file mode 100644 index 0000000000..6622412edf --- /dev/null +++ b/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb.bk @@ -0,0 +1,41 @@ +AMDPCSDBV1 +[AMDPCSROOT/SYSTEM/MCIL] +DigitalHDTVDefaultUnderscan=V0 + +[AMDPCSROOT/SYSTEM/DDX] +EnableTearFreeDesktop=V1 +OGLFMTA2R10G10B10Enable=V1 +VideoOverlay=Soff +OpenGLOverlay=Soff +TexturedVideo=Son +TexturedVideoSync=Son + +[AMDPCSROOT/SYSTEM/2ID-1002-9802-0/OpenGL] +VSyncControl=V3 + +[AMDPCSROOT/SYSTEM/2ID-1002-9803-0/OpenGL] +VSyncControl=V3 + +[AMDPCSROOT/SYSTEM/2ID-1002-9804-0/OpenGL] +VSyncControl=V3 + +[AMDPCSROOT/SYSTEM/2ID-1002-9805-0/OpenGL] +VSyncControl=V3 + +[AMDPCSROOT/SYSTEM/2ID-1002-9802-0/LDC] +GammaChannelSelState=V0 + +[AMDPCSROOT/SYSTEM/2ID-1002-9803-0/LDC] +GammaChannelSelState=V0 + +[AMDPCSROOT/SYSTEM/2ID-1002-9804-0/LDC] +GammaChannelSelState=V0 + +[AMDPCSROOT/SYSTEM/2ID-1002-9805-0/LDC] +GammaChannelSelState=V0 + +[AMDPCSROOT/SYSTEM/2ID-1002-980-0/LDC] +GammaChannelSelState=V0 + +[AMDPCSROOT/SYSTEM/LDC] +ColorPreviewDlgState=V0 \ No newline at end of file diff --git a/packages/x11/driver/xf86-video-fglrx/install b/packages/x11/driver/xf86-video-fglrx/install index 6e71aba180..1f1db9626f 100755 --- a/packages/x11/driver/xf86-video-fglrx/install +++ b/packages/x11/driver/xf86-video-fglrx/install @@ -64,8 +64,7 @@ mkdir -p $INSTALL/etc/X11 mkdir -p $INSTALL/etc/ati cp $PKG_BUILD/common/etc/ati/amdpcsdb.default $INSTALL/etc/ati -# cp $PKG_DIR/config/amdpcsdb $INSTALL/usr/config/fglrx.conf - touch $INSTALL/usr/config/fglrx.conf + cp $PKG_DIR/config/amdpcsdb $INSTALL/usr/config/fglrx.conf ln -sf /storage/.config/fglrx.conf $INSTALL/etc/ati/amdpcsdb cp $PKG_BUILD/common/etc/ati/control $INSTALL/etc/ati cp $PKG_BUILD/common/etc/ati/signature $INSTALL/etc/ati From 649ba2bba57170df8d9a617917b0d5edd1a28c79 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 21 Jul 2011 20:36:12 +0200 Subject: [PATCH 2/8] PyYAML: typo Signed-off-by: Stephan Raue --- packages/python/web/PyYAML/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python/web/PyYAML/meta b/packages/python/web/PyYAML/meta index 518e724c36..516a88e34d 100644 --- a/packages/python/web/PyYAML/meta +++ b/packages/python/web/PyYAML/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://pyyaml.org/" PKG_URL="http://pyyaml.org/download/pyyaml/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="Python disribute yaml" +PKG_DEPENDS="Python distribute yaml" PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross yaml" PKG_PRIORITY="optional" PKG_SECTION="python/web" From ffb99d72b40ad79210368ef8c789d62c04d8c9d4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Jul 2011 07:29:55 +0200 Subject: [PATCH 3/8] linux: update to linux-3.0 Signed-off-by: Stephan Raue --- packages/linux/meta | 10 ++++------ ...scompile.patch => linux-3.0-000_crosscompile.patch} | 0 ...onsole.patch => linux-3.0-003-no_dev_console.patch} | 0 ...> linux-3.0-004_lower_undefined_mode_timeout.patch} | 0 ...able_utf8.patch => linux-3.0-006_enable_utf8.patch} | 0 ...py_die.patch => linux-3.0-007_die_floppy_die.patch} | 0 ...nux-3.0-008-hda_intel_prealloc_4mb_dmabuffer.patch} | 0 ...nux-3.0-009_disable_i8042_check_on_apple_mac.patch} | 0 ...atch => linux-3.0-050_add_appleir_usb_driver.patch} | 0 ...tch => linux-3.0-052-aureal_remote_quirk-0.1.patch} | 0 ....0-053_ati-remote_all_keys_and_keychange-0.1.patch} | 0 ...inux-3.0-058-add_rtl2832u_dvb-usb_driver-0.1.patch} | 0 ...l2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch} | 0 ...=> linux-3.0-071-silence_i915_agp-module-0.1.patch} | 0 ...-0.1.patch => linux-3.0-072-silence_acpi-0.1.patch} | 0 ...3.0-322-omap4_pandaboard_fix_dvi_support-0.1.patch} | 0 ...ss.patch => linux-3.0-716_mm-zero_swappiness.patch} | 0 projects/ATV/linux/linux.i386.conf | 2 +- projects/Fusion/linux/linux.i386.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.x86_64.conf | 2 +- projects/Intel/linux/linux.i386.conf | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- projects/Ultra/linux/linux.x86_64.conf | 2 +- 25 files changed, 12 insertions(+), 14 deletions(-) rename packages/linux/patches/{linux-3.0-rc7-000_crosscompile.patch => linux-3.0-000_crosscompile.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-003-no_dev_console.patch => linux-3.0-003-no_dev_console.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-004_lower_undefined_mode_timeout.patch => linux-3.0-004_lower_undefined_mode_timeout.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-006_enable_utf8.patch => linux-3.0-006_enable_utf8.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-007_die_floppy_die.patch => linux-3.0-007_die_floppy_die.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-008-hda_intel_prealloc_4mb_dmabuffer.patch => linux-3.0-008-hda_intel_prealloc_4mb_dmabuffer.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-009_disable_i8042_check_on_apple_mac.patch => linux-3.0-009_disable_i8042_check_on_apple_mac.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-050_add_appleir_usb_driver.patch => linux-3.0-050_add_appleir_usb_driver.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-052-aureal_remote_quirk-0.1.patch => linux-3.0-052-aureal_remote_quirk-0.1.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch => linux-3.0-053_ati-remote_all_keys_and_keychange-0.1.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-058-add_rtl2832u_dvb-usb_driver-0.1.patch => linux-3.0-058-add_rtl2832u_dvb-usb_driver-0.1.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch => linux-3.0-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-071-silence_i915_agp-module-0.1.patch => linux-3.0-071-silence_i915_agp-module-0.1.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-072-silence_acpi-0.1.patch => linux-3.0-072-silence_acpi-0.1.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-322-omap4_pandaboard_fix_dvi_support-0.1.patch => linux-3.0-322-omap4_pandaboard_fix_dvi_support-0.1.patch} (100%) rename packages/linux/patches/{linux-3.0-rc7-716_mm-zero_swappiness.patch => linux-3.0-716_mm-zero_swappiness.patch} (100%) diff --git a/packages/linux/meta b/packages/linux/meta index 9a72609917..56f3faf066 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,13 +19,12 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="3.0-rc7" +PKG_VERSION="3.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.kernel.org" -#PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.0/testing/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.0/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="busybox linux-drivers linux-firmware" PKG_BUILD_DEPENDS="toolchain busybox-hosttools xz cpio" PKG_PRIORITY="optional" @@ -37,9 +36,8 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" if [ "$LINUX_NEXT" = "yes" -a "$LINUX" = "default" ]; then - PKG_VERSION="2.6.39-rc2" -# PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2" - PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2" + PKG_VERSION="3.0" + PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.0/$PKG_NAME-$PKG_VERSION.tar.bz2" fi if [ "$LINUX" = "ti-omap4" ]; then diff --git a/packages/linux/patches/linux-3.0-rc7-000_crosscompile.patch b/packages/linux/patches/linux-3.0-000_crosscompile.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-000_crosscompile.patch rename to packages/linux/patches/linux-3.0-000_crosscompile.patch diff --git a/packages/linux/patches/linux-3.0-rc7-003-no_dev_console.patch b/packages/linux/patches/linux-3.0-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-003-no_dev_console.patch rename to packages/linux/patches/linux-3.0-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-3.0-rc7-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-3.0-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-3.0-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-3.0-rc7-006_enable_utf8.patch b/packages/linux/patches/linux-3.0-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-006_enable_utf8.patch rename to packages/linux/patches/linux-3.0-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-3.0-rc7-007_die_floppy_die.patch b/packages/linux/patches/linux-3.0-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-007_die_floppy_die.patch rename to packages/linux/patches/linux-3.0-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-3.0-rc7-008-hda_intel_prealloc_4mb_dmabuffer.patch b/packages/linux/patches/linux-3.0-008-hda_intel_prealloc_4mb_dmabuffer.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-008-hda_intel_prealloc_4mb_dmabuffer.patch rename to packages/linux/patches/linux-3.0-008-hda_intel_prealloc_4mb_dmabuffer.patch diff --git a/packages/linux/patches/linux-3.0-rc7-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-3.0-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-3.0-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-3.0-rc7-050_add_appleir_usb_driver.patch b/packages/linux/patches/linux-3.0-050_add_appleir_usb_driver.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-050_add_appleir_usb_driver.patch rename to packages/linux/patches/linux-3.0-050_add_appleir_usb_driver.patch diff --git a/packages/linux/patches/linux-3.0-rc7-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-3.0-052-aureal_remote_quirk-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-052-aureal_remote_quirk-0.1.patch rename to packages/linux/patches/linux-3.0-052-aureal_remote_quirk-0.1.patch diff --git a/packages/linux/patches/linux-3.0-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch b/packages/linux/patches/linux-3.0-053_ati-remote_all_keys_and_keychange-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch rename to packages/linux/patches/linux-3.0-053_ati-remote_all_keys_and_keychange-0.1.patch diff --git a/packages/linux/patches/linux-3.0-rc7-058-add_rtl2832u_dvb-usb_driver-0.1.patch b/packages/linux/patches/linux-3.0-058-add_rtl2832u_dvb-usb_driver-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-058-add_rtl2832u_dvb-usb_driver-0.1.patch rename to packages/linux/patches/linux-3.0-058-add_rtl2832u_dvb-usb_driver-0.1.patch diff --git a/packages/linux/patches/linux-3.0-rc7-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch b/packages/linux/patches/linux-3.0-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch rename to packages/linux/patches/linux-3.0-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch diff --git a/packages/linux/patches/linux-3.0-rc7-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/linux-3.0-071-silence_i915_agp-module-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-071-silence_i915_agp-module-0.1.patch rename to packages/linux/patches/linux-3.0-071-silence_i915_agp-module-0.1.patch diff --git a/packages/linux/patches/linux-3.0-rc7-072-silence_acpi-0.1.patch b/packages/linux/patches/linux-3.0-072-silence_acpi-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-072-silence_acpi-0.1.patch rename to packages/linux/patches/linux-3.0-072-silence_acpi-0.1.patch diff --git a/packages/linux/patches/linux-3.0-rc7-322-omap4_pandaboard_fix_dvi_support-0.1.patch b/packages/linux/patches/linux-3.0-322-omap4_pandaboard_fix_dvi_support-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-322-omap4_pandaboard_fix_dvi_support-0.1.patch rename to packages/linux/patches/linux-3.0-322-omap4_pandaboard_fix_dvi_support-0.1.patch diff --git a/packages/linux/patches/linux-3.0-rc7-716_mm-zero_swappiness.patch b/packages/linux/patches/linux-3.0-716_mm-zero_swappiness.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc7-716_mm-zero_swappiness.patch rename to packages/linux/patches/linux-3.0-716_mm-zero_swappiness.patch diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 483b598a31..9787c75c86 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.0-rc6 Kernel Configuration +# Linux/i386 3.0.0 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 87511beef2..57a8396d10 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.0-rc6 Kernel Configuration +# Linux/i386 3.0.0 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index f132edb1f1..043e4c4873 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.0-rc6 Kernel Configuration +# Linux/i386 3.0.0 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index c530b498cc..34d8c83e03 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.0-rc6 Kernel Configuration +# Linux/i386 3.0.0 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 7c267b5ed0..1c055a821a 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.0-rc6 Kernel Configuration +# Linux/x86_64 3.0.0 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index bdb87b12fb..f8e5296d3f 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.0-rc7 Kernel Configuration +# Linux/i386 3.0.0 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index e7e41a884b..c9debc4a16 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.0-rc7 Kernel Configuration +# Linux/x86_64 3.0.0 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 270ba1a5b3..c651f1eb69 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.0-rc6 Kernel Configuration +# Linux/x86_64 3.0.0 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set From d343ba9e88f90884c22de8dba2445ecbd8517ab4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Jul 2011 09:06:16 +0200 Subject: [PATCH 4/8] llvm: rename ARCH variable to LLVM_ARCH, because its already used Signed-off-by: Stephan Raue --- packages/devel/llvm/build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/devel/llvm/build b/packages/devel/llvm/build index 5b6560618d..b31ec67c27 100755 --- a/packages/devel/llvm/build +++ b/packages/devel/llvm/build @@ -26,9 +26,9 @@ strip_lto if [ "$TARGET_ARCH" = i386 ]; then - ARCH=x86 + LLVM_ARCH=x86 elif [ "$TARGET_ARCH" = x86_64 ]; then - ARCH=x86_64 + LLVM_ARCH=x86_64 fi LLVM_DIR=`ls -d $BUILD/llvm-[0-9]*` @@ -56,7 +56,7 @@ mkdir -p .build-target && cd .build-target --enable-shared \ --enable-embed-stdcxx \ --enable-timestamps \ - --enable-targets=$ARCH \ + --enable-targets=$LLVM_ARCH \ TBLGEN="$ROOT/$TOOLCHAIN/bin/tblgen" \ TCLSH="$ROOT/$TOOLCHAIN/bin/tclsh" \ From f9ebc89c02d357fd38373c1073bab1efd28c80c9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Jul 2011 16:02:33 +0200 Subject: [PATCH 5/8] Mesa: add patch to link against shared LLVM library Signed-off-by: Stephan Raue --- packages/graphics/Mesa/meta | 3 +-- .../Mesa/patches/Mesa-7.11-rc2-llvm_so.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 packages/graphics/Mesa/patches/Mesa-7.11-rc2-llvm_so.patch diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta index 115295f728..330b369cb5 100644 --- a/packages/graphics/Mesa/meta +++ b/packages/graphics/Mesa/meta @@ -40,6 +40,5 @@ get_graphicdrivers if [ "$LLVM_SUPPORT" = "yes" ]; then PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS llvm" -# actually we dont need llvm installed because its linked statically -# PKG_DEPENDS="$PKG_DEPENDS llvm" + PKG_DEPENDS="$PKG_DEPENDS llvm" fi diff --git a/packages/graphics/Mesa/patches/Mesa-7.11-rc2-llvm_so.patch b/packages/graphics/Mesa/patches/Mesa-7.11-rc2-llvm_so.patch new file mode 100644 index 0000000000..378b1a7a70 --- /dev/null +++ b/packages/graphics/Mesa/patches/Mesa-7.11-rc2-llvm_so.patch @@ -0,0 +1,12 @@ +diff -Naur Mesa-7.11-rc2-old/configure.ac Mesa-7.11-rc2-new/configure.ac +--- Mesa-7.11-rc2-old/configure.ac 2011-07-19 16:39:56.000000000 -0700 ++++ Mesa-7.11-rc2-new/configure.ac 2011-07-21 10:08:33.000000000 -0700 +@@ -1737,7 +1737,7 @@ + if test "x$LLVM_CONFIG" != xno; then + LLVM_VERSION=`$LLVM_CONFIG --version` + LLVM_CFLAGS=`$LLVM_CONFIG --cppflags` +- LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++" ++ LLVM_LIBS="-lLLVM-$LLVM_VERSION -lstdc++" + + LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` + GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe" From 695f3175d6dbab5401b0490cd5822484c22fc81f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Jul 2011 16:03:28 +0200 Subject: [PATCH 6/8] Mesa: rework build options Signed-off-by: Stephan Raue --- packages/graphics/Mesa/build | 43 +++++++++++++++++++++++++++------- packages/graphics/Mesa/install | 5 ++-- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build index a897c51231..a87cc73e16 100755 --- a/packages/graphics/Mesa/build +++ b/packages/graphics/Mesa/build @@ -26,8 +26,22 @@ get_graphicdrivers # dont use gold linker because of compiling issues strip_gold - strip_linker_plugin - strip_lto # Mesa fails to build with LTO optimization + +# Mesa fails to build with LTO optimization + strip_lto + +# dont build with loop and graphite optimization + CFLAGS=`echo $CFLAGS | sed -e "s|-ftree-loop-distribution||"` + CFLAGS=`echo $CFLAGS | sed -e "s|-floop-interchange||"` + CFLAGS=`echo $CFLAGS | sed -e "s|-floop-strip-mine||"` + CFLAGS=`echo $CFLAGS | sed -e "s|-floop-block||"` + CFLAGS=`echo $CFLAGS | sed -e "s|-fgraphite-identity||"` + + CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-ftree-loop-distribution||"` + CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-floop-interchange||"` + CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-floop-strip-mine||"` + CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-floop-block||"` + CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-fgraphite-identity||"` if [ "$LLVM_SUPPORT" = "yes" ]; then export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config" @@ -50,23 +64,35 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \ --localstatedir=/var \ --disable-static \ --enable-shared \ - --enable-shared-dricore \ --disable-debug \ + --disable-texture-float \ --disable-selinux \ - --enable-xcb \ + --enable-opengl \ --disable-glx-tls \ --enable-driglx-direct \ - --disable-egl \ + --disable-gles1 \ + --disable-gles2 \ + --disable-openvg \ + --disable-xorg \ --enable-glu \ --disable-gl-osmesa \ --disable-glut \ --disable-glw \ --disable-motif \ - --with-gallium-drivers="$GALLIUM_DRIVERS" \ + --disable-d3d1x \ + --disable-egl \ + --disable-gbm \ + --disable-gallium-egl \ + --disable-gallium-gbm \ + --enable-shared-glapi \ + --enable-xcb \ + --enable-shared-dricore \ + --disable-egl \ $MESA_GALLIUM_LLVM \ + --with-gallium-drivers="$GALLIUM_DRIVERS" \ --with-driver="dri" \ --with-dri-drivers="$DRI_DRIVERS" \ - --with-xorg-driver-dir="$XORG_PATH_DRIVERS" \ + --with-x \ make CC="$HOST_CC" \ CXX="$HOST_CXX" \ @@ -82,5 +108,4 @@ sed -e "s#\.\/builtin_compiler#$ROOT/$TOOLCHAIN/bin/builtin_compiler#g" -i src/g make -$MAKEINSTALL -C src/mesa -$MAKEINSTALL -C src/glu +$MAKEINSTALL diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install index bbaa1750e2..1dd173c116 100755 --- a/packages/graphics/Mesa/install +++ b/packages/graphics/Mesa/install @@ -27,10 +27,11 @@ mkdir -p $INSTALL/usr/lib ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1 cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib - cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib - cp -P $PKG_BUILD/lib/libglsl.so $INSTALL/usr/lib + cp -P $PKG_BUILD/lib/libglapi.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/dri + cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib + cp -P $PKG_BUILD/lib/libglsl.so $INSTALL/usr/lib cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true cp -P $PKG_BUILD/lib/gallium/*_dri.so $INSTALL/usr/lib/dri || true From 0c2bd2a8814a74400882c94f6e2684424fd35bed Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Jul 2011 16:04:08 +0200 Subject: [PATCH 7/8] xf86-video-nvidia: update to xf86-video-nvidia-275.21 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-nvidia/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta index d139aa44ce..63a1b19297 100644 --- a/packages/x11/driver/xf86-video-nvidia/meta +++ b/packages/x11/driver/xf86-video-nvidia/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-nvidia" -PKG_VERSION="275.19" +PKG_VERSION="275.21" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" From 25b809290ae7a2e1ff08d0c997ac64fd785aeb99 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Jul 2011 21:33:23 +0200 Subject: [PATCH 8/8] linux: revert d7b290a1056c5564eec8a1b169c6e84ff3f54c13 Signed-off-by: Stephan Raue --- ...rt_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/linux/patches/linux-3.0-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch diff --git a/packages/linux/patches/linux-3.0-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch b/packages/linux/patches/linux-3.0-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch new file mode 100644 index 0000000000..08566d1f13 --- /dev/null +++ b/packages/linux/patches/linux-3.0-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch @@ -0,0 +1,12 @@ +diff -Naur linux-3.0/drivers/media/rc/nuvoton-cir.c linux-3.0.patch/drivers/media/rc/nuvoton-cir.c +--- linux-3.0/drivers/media/rc/nuvoton-cir.c 2011-07-22 04:17:23.000000000 +0200 ++++ linux-3.0.patch/drivers/media/rc/nuvoton-cir.c 2011-07-22 21:30:48.374591146 +0200 +@@ -1110,7 +1110,7 @@ + rdev->dev.parent = &pdev->dev; + rdev->driver_name = NVT_DRIVER_NAME; + rdev->map_name = RC_MAP_RC6_MCE; +- rdev->timeout = MS_TO_NS(100); ++ rdev->timeout = US_TO_NS(1000); + /* rx resolution is hardwired to 50us atm, 1, 25, 100 also possible */ + rdev->rx_resolution = US_TO_NS(CIR_SAMPLE_PERIOD); + #if 0