From 3732ba8acc6cc8459df842ba839017a9041d65a6 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 25 Jun 2012 02:20:35 -0300 Subject: linux-libre-3.4.4-2: adding new patchs and updating revision --- .../3.4.4-fix-backlight-regression.patch | 38 ++++++++++++++++++++++ .../3.4.4-fix-gtx560ti-nouveau-regression.patch | 20 ++++++++++++ libre/linux-libre/ChangeLog | 13 +++++--- libre/linux-libre/PKGBUILD | 20 ++++++++++-- libre/linux-libre/linux-libre.install | 2 +- 5 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 libre/linux-libre/3.4.4-fix-backlight-regression.patch create mode 100644 libre/linux-libre/3.4.4-fix-gtx560ti-nouveau-regression.patch diff --git a/libre/linux-libre/3.4.4-fix-backlight-regression.patch b/libre/linux-libre/3.4.4-fix-backlight-regression.patch new file mode 100644 index 000000000..a0cf0b1db --- /dev/null +++ b/libre/linux-libre/3.4.4-fix-backlight-regression.patch @@ -0,0 +1,38 @@ +Subject: Still use ACPI backlight control if _DOS doesn't exist + +This is a regression introduced by commit +ea9f8856bd6d4ed45885b06a338f7362cd6c60e5 + +https://bugzilla.kernel.org/show_bug.cgi?id=43168 + +Some platforms don't have _DOS control method, but the ACPI +backlight still works. +We do not want to lose the backlight control ability on these platforms. + +CC : Igor Murzov +Signed-off-by: Zhang Rui +--- + drivers/acpi/video.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +Index: rtd3/drivers/acpi/video.c +=================================================================== +--- rtd3.orig/drivers/acpi/video.c ++++ rtd3/drivers/acpi/video.c +@@ -565,8 +565,14 @@ acpi_video_bus_DOS(struct acpi_video_bus + video->dos_setting = arg0.integer.value; + status = acpi_evaluate_object(video->device->handle, "_DOS", + &args, NULL); +- if (ACPI_FAILURE(status)) +- return -EIO; ++ if (ACPI_FAILURE(status)) { ++ /* ++ * some platforms don't have _DOS, but the ACPI ++ * backlight control still works ++ */ ++ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No _DOS\n")); ++ return 0; ++ } + + return 0; + } diff --git a/libre/linux-libre/3.4.4-fix-gtx560ti-nouveau-regression.patch b/libre/linux-libre/3.4.4-fix-gtx560ti-nouveau-regression.patch new file mode 100644 index 000000000..1b70e918c --- /dev/null +++ b/libre/linux-libre/3.4.4-fix-gtx560ti-nouveau-regression.patch @@ -0,0 +1,20 @@ +Revert change to include/drm/drm_fb_helper.h made in commit 4f988d132d2668b4f3b42bfc70daa531115ccca1 + + include/drm/drm_fb_helper.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h +index 55e10d6..5120b01 100644 +--- a/include/drm/drm_fb_helper.h ++++ b/include/drm/drm_fb_helper.h +@@ -35,6 +35,7 @@ struct drm_fb_helper; + #include + + struct drm_fb_helper_crtc { ++ uint32_t crtc_id; + struct drm_mode_set mode_set; + struct drm_display_mode *desired_mode; + }; +-- +1.7.6.5 + diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog index a6f62e2cd..b41198fe5 100644 --- a/libre/linux-libre/ChangeLog +++ b/libre/linux-libre/ChangeLog @@ -1,19 +1,24 @@ -2012-05-26 André Silva +2012-06-23 André Silva + + * linux-libre-3.4.4-1 + * Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com. + +2012-05-26 André Silva * linux-libre-3.4-1.2 * Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116 -2012-04-24 André Silva +2012-04-24 André Silva * linux-libre-3.3.3-1 * Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90 -2012-04-08 André Silva +2012-04-08 André Silva * linux-libre-3.3.1-1.1 * Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47 -2012-03-03 André Silva +2012-03-03 André Silva * linux-libre-2.3.9-2 * Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 71a548e0a..3ff5e5681 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Sorin-Mihai Vârgolici # Maintainer (Parabola): André Silva # Maintainer (Parabola): Michał Masłowski -# Contributor (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva pkgbase=linux-libre pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel @@ -15,7 +15,7 @@ _basekernel=3.4 _sublevel=4 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,6 +32,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' + '3.4.4-fix-backlight-regression.patch' + '3.4.4-fix-gtx560ti-nouveau-regression.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' 'e9bb311ab329555a61696b1a18df2d34' @@ -43,6 +45,8 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' + '80a46681386bb87813989faeb92bdd9a' + '827ffd855dc8b0c91577545c5804c19f' '86910efeadb5d1e5d5416ff1a9dacb33') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -72,7 +76,19 @@ build() { # needed. patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" + # Fix backlight control on some laptops: + # https://bugzilla.kernel.org/show_bug.cgi?id=43168 + patch -Np1 -i "${srcdir}/3.4.4-fix-backlight-regression.patch" + + # fix nouveau regression + # Arch Linux bug report: FS#30417 + patch -Np1 -i "${srcdir}/3.4.4-fix-gtx560ti-nouveau-regression.patch" + # Patch submitted upstream, waiting for inclusion: + # https://lkml.org/lkml/2012/2/19/51 + # add support for latest bios of Acer 1810T acerhdf module + patch -Np1 -i "${srcdir}/fix-acerhdf-1810T-bios.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index ba766d0c7..5e87c939e 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.4-1-LIBRE +KERNEL_VERSION=3.4.4-2-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' -- cgit v1.2.3-54-g00ecf