From b6a93435861d597e6ee9cfea79c4981a44b746c8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 26 Aug 2013 01:53:18 +0200 Subject: [PATCH 01/11] xbmc: fix dual audio patch Signed-off-by: Stephan Raue --- .../12.2-83bda98/xbmc-999-dualaudiofix.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-999-dualaudiofix.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-999-dualaudiofix.patch b/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-999-dualaudiofix.patch new file mode 100644 index 0000000000..1d46fbef55 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-999-dualaudiofix.patch @@ -0,0 +1,13 @@ +diff -Naur xbmc-12.2-83bda98/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp xbmc-12.2-83bda98.patch/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp +--- xbmc-12.2-83bda98/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp 2013-08-25 21:45:30.000000000 +0200 ++++ xbmc-12.2-83bda98.patch/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp 2013-08-26 01:26:41.950633846 +0200 +@@ -277,7 +277,9 @@ + case 0: g_guiSettings.SetInt("audiooutput.mode", AUDIO_ANALOG ); break; + case 1: g_guiSettings.SetInt("audiooutput.mode", AUDIO_IEC958 ); bitstream = true; break; + case 2: g_guiSettings.SetInt("audiooutput.mode", AUDIO_HDMI ); bitstream = true; break; ++#ifdef TARGET_RASPBERRY_PI + case 3: g_guiSettings.SetInt("audiooutput.mode", AUDIO_BOTH ); break; ++#endif + } + + EnableSettings(AUDIO_SETTINGS_OUTPUT_TO_ALL_SPEAKERS, bitstream); From 3efd274a804f2df14383675bff10b2801a76d844 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 26 Aug 2013 15:05:11 +0200 Subject: [PATCH 02/11] Mesa: update to Mesa-9.2-rc2 Signed-off-by: Stephan Raue --- packages/graphics/Mesa/package.mk | 4 +- .../Mesa/patches/Mesa-AC_CHECK_FILE.patch | 39 ------------ .../graphics/Mesa/patches/Mesa-cross.patch | 60 ------------------- 3 files changed, 2 insertions(+), 101 deletions(-) delete mode 100644 packages/graphics/Mesa/patches/Mesa-AC_CHECK_FILE.patch delete mode 100644 packages/graphics/Mesa/patches/Mesa-cross.patch diff --git a/packages/graphics/Mesa/package.mk b/packages/graphics/Mesa/package.mk index 680d4825b8..3953697492 100644 --- a/packages/graphics/Mesa/package.mk +++ b/packages/graphics/Mesa/package.mk @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="Mesa" -PKG_VERSION="9.1.6" +PKG_VERSION="9.2.0-rc2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.mesa3d.org/" -PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://freedesktop.org/pub/mesa/9.2/MesaLib-$PKG_VERSION.tar.bz2" PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libX11" PKG_BUILD_DEPENDS_TARGET="toolchain Python-host makedepend:host libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11" PKG_PRIORITY="optional" diff --git a/packages/graphics/Mesa/patches/Mesa-AC_CHECK_FILE.patch b/packages/graphics/Mesa/patches/Mesa-AC_CHECK_FILE.patch deleted file mode 100644 index 9b2ea631ea..0000000000 --- a/packages/graphics/Mesa/patches/Mesa-AC_CHECK_FILE.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur Mesa-9.1.1/configure.ac Mesa-9.1.1.patch/configure.ac ---- Mesa-9.1.1/configure.ac 2013-03-20 01:14:17.000000000 +0100 -+++ Mesa-9.1.1.patch/configure.ac 2013-05-01 02:51:48.086299947 +0200 -@@ -1923,7 +1923,9 @@ - if test "x$with_llvm_shared_libs" = xyes; then - dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, - LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` -- AC_CHECK_FILE("$LLVM_LIBDIR/lib$LLVM_SO_NAME.so", llvm_have_one_so=yes,) -+ if test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.so"; then -+ llvm_have_one_so=yes -+ fi - - if test "x$llvm_have_one_so" = xyes; then - dnl LLVM was built using auto*, so there is only one shared object. -@@ -1931,8 +1933,8 @@ - else - dnl If LLVM was built with CMake, there will be one shared object per - dnl component. -- AC_CHECK_FILE("$LLVM_LIBDIR/libLLVMTarget.so",, -- AC_MSG_ERROR([Could not find llvm shared libraries: -+ if test ! -f "$LLVM_LIBDIR/libLLVMTarget.so"; then -+ AC_MSG_ERROR([Could not find llvm shared libraries: - Please make sure you have built llvm with the --enable-shared option - and that your llvm libraries are installed in $LLVM_LIBDIR - If you have installed your llvm libraries to a different directory you -@@ -1943,11 +1945,12 @@ - --enable-opencl - If you do not want to build with llvm shared libraries and instead want to - use llvm static libraries then remove these options from your configure -- invocation and reconfigure.])) -+ invocation and reconfigure.]) - - dnl We don't need to update LLVM_LIBS in this case because the LLVM - dnl install uses a shared object for each compoenent and we have - dnl already added all of these objects to LLVM_LIBS. -+ fi - fi - fi - fi diff --git a/packages/graphics/Mesa/patches/Mesa-cross.patch b/packages/graphics/Mesa/patches/Mesa-cross.patch deleted file mode 100644 index d6693acf90..0000000000 --- a/packages/graphics/Mesa/patches/Mesa-cross.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -up Mesa-9.1.1/src/glsl/builtin_compiler/Makefile.am.cross Mesa-9.1.1/src/glsl/builtin_compiler/Makefile.am ---- Mesa-9.1.1/src/glsl/builtin_compiler/Makefile.am.cross 2013-03-28 14:56:22.990746189 +0100 -+++ Mesa-9.1.1/src/glsl/builtin_compiler/Makefile.am 2013-03-28 14:56:32.483577384 +0100 -@@ -64,13 +64,13 @@ AM_CXXFLAGS = $(AM_CFLAGS) - include ../Makefile.sources - - noinst_PROGRAMS = builtin_compiler --noinst_LTLIBRARIES = libglslcore.la libglcpp.la -+noinst_LIBRARIES = libglslcore.a libglcpp.a - --libglcpp_la_SOURCES = \ -+libglcpp_a_SOURCES = \ - $(LIBGLCPP_GENERATED_FILES) \ - $(LIBGLCPP_FILES) - --libglslcore_la_SOURCES = \ -+libglslcore_a_SOURCES = \ - $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ - $(LIBGLSL_FILES) - -@@ -81,4 +81,4 @@ builtin_compiler_SOURCES = \ - $(top_srcdir)/src/mesa/program/symbol_table.c \ - $(BUILTIN_COMPILER_CXX_FILES) \ - $(GLSL_COMPILER_CXX_FILES) --builtin_compiler_LDADD = libglslcore.la libglcpp.la -+builtin_compiler_LDADD = libglslcore.a libglcpp.a -diff -up Mesa-9.1.1/src/glsl/Makefile.am.cross Mesa-9.1.1/src/glsl/Makefile.am ---- Mesa-9.1.1/src/glsl/Makefile.am.cross 2013-03-28 14:56:26.565682626 +0100 -+++ Mesa-9.1.1/src/glsl/Makefile.am 2013-03-28 14:59:13.109723407 +0100 -@@ -73,14 +73,10 @@ tests_ralloc_test_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(PTHREAD_LIBS) - --if CROSS_COMPILING - libglcpp_la_SOURCES = \ - glcpp/glcpp-lex.c \ - glcpp/glcpp-parse.c \ - $(LIBGLCPP_FILES) --else --libglcpp_la_LIBADD = builtin_compiler/libglcpp.la --endif - - glcpp_glcpp_SOURCES = \ - glcpp/glcpp.c \ -@@ -89,15 +85,10 @@ glcpp_glcpp_LDADD = libglcpp.la - - libglsl_la_SOURCES = builtin_function.cpp - libglsl_la_LIBADD = libglcpp.la --if CROSS_COMPILING - libglsl_la_SOURCES += \ - glsl_lexer.cpp \ - glsl_parser.cpp \ - $(LIBGLSL_FILES) --else --libglsl_la_LIBADD += \ -- builtin_compiler/libglslcore.la --endif - - glsl_test_SOURCES = \ - $(top_srcdir)/src/mesa/main/hash_table.c \ From 4c0b3360a532bf351500628b1426114071533bae Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 26 Aug 2013 15:05:44 +0200 Subject: [PATCH 03/11] projects/Generic_OSS/linux: force enable audio on Radeon GPUs Signed-off-by: Stephan Raue --- projects/Generic_OSS/linux/linux.i386.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index fc274bd920..0f2e7f4b1a 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -435,7 +435,7 @@ CONFIG_HOTPLUG_CPU=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_COMPAT_VDSO is not set CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init radeon.audio=1" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y From fb32acba0e721d9928afe683eac6e5be86da9797 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 26 Aug 2013 15:26:09 +0200 Subject: [PATCH 04/11] xf86-video-ati: convert to new package format Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-ati/build | 40 ------------------- packages/x11/driver/xf86-video-ati/install | 32 --------------- .../xf86-video-ati/{meta => package.mk} | 9 ++++- 3 files changed, 7 insertions(+), 74 deletions(-) delete mode 100755 packages/x11/driver/xf86-video-ati/build delete mode 100755 packages/x11/driver/xf86-video-ati/install rename packages/x11/driver/xf86-video-ati/{meta => package.mk} (86%) diff --git a/packages/x11/driver/xf86-video-ati/build b/packages/x11/driver/xf86-video-ati/build deleted file mode 100755 index e7a3c884ef..0000000000 --- a/packages/x11/driver/xf86-video-ati/build +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD - -xorg_drv_configure_prepend - -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-shared \ - --disable-static \ - --enable-dri \ - --enable-exa \ - --enable-kms \ - --with-xorg-module-dir=$XORG_PATH_MODULES - -make diff --git a/packages/x11/driver/xf86-video-ati/install b/packages/x11/driver/xf86-video-ati/install deleted file mode 100755 index c53fa6569b..0000000000 --- a/packages/x11/driver/xf86-video-ati/install +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers - cp $PKG_BUILD/src/.libs/ati_drv.so $INSTALL/$XORG_PATH_MODULES/drivers - cp $PKG_BUILD/src/.libs/radeon_drv.so $INSTALL/$XORG_PATH_MODULES/drivers - -mkdir -p $INSTALL/$XORG_PATH_MODULES/multimedia - cp $PKG_BUILD/src/.libs/theatre_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia - cp $PKG_BUILD/src/.libs/theatre200_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia - cp $PKG_BUILD/src/.libs/theatre_detect_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia diff --git a/packages/x11/driver/xf86-video-ati/meta b/packages/x11/driver/xf86-video-ati/package.mk similarity index 86% rename from packages/x11/driver/xf86-video-ati/meta rename to packages/x11/driver/xf86-video-ati/package.mk index be5a884f9f..9a7f1dbda6 100644 --- a/packages/x11/driver/xf86-video-ati/meta +++ b/packages/x11/driver/xf86-video-ati/package.mk @@ -26,11 +26,16 @@ PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_BUILD_DEPENDS_TARGET="toolchain" PKG_PRIORITY="optional" PKG_SECTION="x11/driver" PKG_SHORTDESC="xf86-video-ati: The Xorg driver for ATI video chips" PKG_LONGDESC="The ati driver supports various ATi, know AMD, video chips." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +PKG_CONFIGURE_OPTS_TARGET="--enable-dri \ + --enable-exa \ + --enable-kms \ + --with-xorg-module-dir=$XORG_PATH_MODULES" From fe12d213f72f0b3c6e867117c2e349e4b68a7965 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 26 Aug 2013 15:33:06 +0200 Subject: [PATCH 05/11] xf86-video-ati: update to xf86-video-ati-7.2.0 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-ati/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-ati/package.mk b/packages/x11/driver/xf86-video-ati/package.mk index 9a7f1dbda6..9e42f59207 100644 --- a/packages/x11/driver/xf86-video-ati/package.mk +++ b/packages/x11/driver/xf86-video-ati/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-ati" -PKG_VERSION="6.14.4" +PKG_VERSION="7.2.0" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" From e30b158501742767710422f5636aaf9d07acde73 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 26 Aug 2013 16:06:35 +0200 Subject: [PATCH 06/11] xf86-video-nouveau: convert to new package format Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-nouveau/build | 34 ------------------- .../x11/driver/xf86-video-nouveau/install | 29 ---------------- .../xf86-video-nouveau/{meta => package.mk} | 13 ++++--- 3 files changed, 9 insertions(+), 67 deletions(-) delete mode 100755 packages/x11/driver/xf86-video-nouveau/build delete mode 100755 packages/x11/driver/xf86-video-nouveau/install rename packages/x11/driver/xf86-video-nouveau/{meta => package.mk} (85%) diff --git a/packages/x11/driver/xf86-video-nouveau/build b/packages/x11/driver/xf86-video-nouveau/build deleted file mode 100755 index d68b6cbbd8..0000000000 --- a/packages/x11/driver/xf86-video-nouveau/build +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static \ - --enable-shared \ - --with-xorg-module-dir=$XORG_PATH_MODULES - -make diff --git a/packages/x11/driver/xf86-video-nouveau/install b/packages/x11/driver/xf86-video-nouveau/install deleted file mode 100755 index 4179ae497b..0000000000 --- a/packages/x11/driver/xf86-video-nouveau/install +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options - -mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers - cp $PKG_BUILD/src/.libs/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers - -mkdir -p $INSTALL/etc/X11 - cp $PKG_DIR/config/*.conf $INSTALL/etc/X11 diff --git a/packages/x11/driver/xf86-video-nouveau/meta b/packages/x11/driver/xf86-video-nouveau/package.mk similarity index 85% rename from packages/x11/driver/xf86-video-nouveau/meta rename to packages/x11/driver/xf86-video-nouveau/package.mk index d2741c8cf3..7fd0cc2890 100644 --- a/packages/x11/driver/xf86-video-nouveau/meta +++ b/packages/x11/driver/xf86-video-nouveau/package.mk @@ -24,15 +24,20 @@ PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" -# PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" -# PKG_URL="http://cgit.freedesktop.org/nouveau/xf86-video-nouveau/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_URL="http://cgit.freedesktop.org/nouveau/xf86-video-nouveau/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="libXrandr libXrender libdrm libXext libpciaccess systemd Mesa glu" -PKG_BUILD_DEPENDS="toolchain util-macros libXrandr libXrender libdrm libXext libpciaccess systemd Mesa glu xorg-server" +PKG_BUILD_DEPENDS_TARGET="toolchain util-macros libXrandr libXrender libdrm libXext libpciaccess systemd Mesa glu xorg-server" PKG_PRIORITY="optional" PKG_SECTION="x11/driver" PKG_SHORTDESC="xf86-video-nouveau: Nouveau display driver (experimental)" PKG_LONGDESC="This driver for the X.Org X server (see xserver-xorg for a further description) provides support for NVIDIA Riva, TNT, GeForce, and Quadro cards. Although the nouveau project aims to provide full 3D support it is not yet complete, and these packages do not include any 3D support. Users requiring 3D support should use the non-free "nvidia" driver." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +PKG_CONFIGURE_OPTS_TARGET="--with-xorg-module-dir=$XORG_PATH_MODULES" + +post_makeinstall_target() { + mkdir -p $INSTALL/etc/X11 + cp $PKG_DIR/config/*.conf $INSTALL/etc/X11 +} From 6801ed3fe1caebf13414a94741e8a5990c295434 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 26 Aug 2013 16:07:05 +0200 Subject: [PATCH 07/11] xf86-video-nouveau: update to xf86-video-nouveau-1.0.9 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-nouveau/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-nouveau/package.mk b/packages/x11/driver/xf86-video-nouveau/package.mk index 7fd0cc2890..665398d5ee 100644 --- a/packages/x11/driver/xf86-video-nouveau/package.mk +++ b/packages/x11/driver/xf86-video-nouveau/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-nouveau" -PKG_VERSION="1.0.2" +PKG_VERSION="1.0.9" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" From e664517954e5ceab8b6f42d49637c96e01f12831 Mon Sep 17 00:00:00 2001 From: newphreak Date: Mon, 26 Aug 2013 18:19:29 +0200 Subject: [PATCH 08/11] alsa-lib: revert to v1.0.26 --- packages/audio/alsa/alsa-lib/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/audio/alsa/alsa-lib/package.mk b/packages/audio/alsa/alsa-lib/package.mk index 8c9fa62465..fe648ef4ca 100644 --- a/packages/audio/alsa/alsa-lib/package.mk +++ b/packages/audio/alsa/alsa-lib/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="alsa-lib" -PKG_VERSION="1.0.27.2" +PKG_VERSION="1.0.26" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From d11b47a0356f80e595e0d520a2f4c3994163835c Mon Sep 17 00:00:00 2001 From: newphreak Date: Mon, 26 Aug 2013 20:15:49 +0300 Subject: [PATCH 09/11] Revert "alsa-lib: revert to v1.0.26" This reverts commit e664517954e5ceab8b6f42d49637c96e01f12831. --- packages/audio/alsa/alsa-lib/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/audio/alsa/alsa-lib/package.mk b/packages/audio/alsa/alsa-lib/package.mk index fe648ef4ca..8c9fa62465 100644 --- a/packages/audio/alsa/alsa-lib/package.mk +++ b/packages/audio/alsa/alsa-lib/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="alsa-lib" -PKG_VERSION="1.0.26" +PKG_VERSION="1.0.27.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From bcd2f226889b87bd2002d486ff7051d0c41e5aa2 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 26 Aug 2013 23:16:26 +0300 Subject: [PATCH 10/11] linux: re-enable RC6 on Ironlake and Sandybridge GT1 revert this is if there are still freezes ref #2541 --- .../linux-997-disable-rc6-on-sandybridge-gt1.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 packages/linux/patches/3.10.9/linux-997-disable-rc6-on-sandybridge-gt1.patch diff --git a/packages/linux/patches/3.10.9/linux-997-disable-rc6-on-sandybridge-gt1.patch b/packages/linux/patches/3.10.9/linux-997-disable-rc6-on-sandybridge-gt1.patch deleted file mode 100644 index c0a9067fe1..0000000000 --- a/packages/linux/patches/3.10.9/linux-997-disable-rc6-on-sandybridge-gt1.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/gpu/drm/i915/intel_pm.c 2013-05-30 22:57:09.098080381 +0200 -+++ b/drivers/gpu/drm/i915/intel_pm.c 2013-05-30 23:31:31.644308032 +0200 -@@ -2503,8 +2503,8 @@ - if (i915_enable_rc6 >= 0) - return i915_enable_rc6; - -- /* Disable RC6 on Ironlake */ -- if (INTEL_INFO(dev)->gen == 5) -+ /* Disable RC6 on Ironlake and Sandybridge GT1 */ -+ if (INTEL_INFO(dev)->gen == 5 || IS_SNB_GT1(dev)) - return 0; - - if (IS_HASWELL(dev)) { From e645044140da55f5afb9403946d0444418ac690e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 26 Aug 2013 23:14:18 +0200 Subject: [PATCH 11/11] kmod: convert to new package format, update to kmod-15 Signed-off-by: Stephan Raue --- packages/sysutils/kmod/build | 43 -------------------- packages/sysutils/kmod/install | 44 --------------------- packages/sysutils/kmod/{meta => package.mk} | 34 ++++++++++++++-- 3 files changed, 31 insertions(+), 90 deletions(-) delete mode 100755 packages/sysutils/kmod/build delete mode 100755 packages/sysutils/kmod/install rename packages/sysutils/kmod/{meta => package.mk} (61%) diff --git a/packages/sysutils/kmod/build b/packages/sysutils/kmod/build deleted file mode 100755 index 835fa6bba7..0000000000 --- a/packages/sysutils/kmod/build +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --disable-silent-rules \ - --disable-static \ - --enable-shared \ - --enable-tools \ - --enable-logging \ - --disable-debug \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --with-gnu-ld \ - --without-xz \ - --without-zlib - -make -$MAKEINSTALL diff --git a/packages/sysutils/kmod/install b/packages/sysutils/kmod/install deleted file mode 100755 index 9c9b7a18dc..0000000000 --- a/packages/sysutils/kmod/install +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/libkmod/.libs/*.so* $INSTALL/usr/lib - -mkdir -p $INSTALL/usr/bin - cp -P $PKG_BUILD/tools/.libs/kmod $INSTALL/usr/bin - -mkdir -p $INSTALL/sbin - ln -sf /usr/bin/kmod $INSTALL/sbin/lsmod - ln -sf /usr/bin/kmod $INSTALL/sbin/insmod - ln -sf /usr/bin/kmod $INSTALL/sbin/rmmod - ln -sf /usr/bin/kmod $INSTALL/sbin/modinfo - ln -sf /usr/bin/kmod $INSTALL/sbin/modprobe - -# add system modprobe.d dir - mkdir -p $INSTALL/etc/modprobe.d - cp $PKG_DIR/modprobe.d/* $INSTALL/etc/modprobe.d - -# add user modprobe.d dir - mkdir -p $INSTALL/usr/config/modprobe.d - diff --git a/packages/sysutils/kmod/meta b/packages/sysutils/kmod/package.mk similarity index 61% rename from packages/sysutils/kmod/meta rename to packages/sysutils/kmod/package.mk index cfe021034e..123339d74d 100644 --- a/packages/sysutils/kmod/meta +++ b/packages/sysutils/kmod/package.mk @@ -19,18 +19,46 @@ ################################################################################ PKG_NAME="kmod" -PKG_VERSION="14" +PKG_VERSION="15" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://git.profusion.mobi/cgit.cgi/kmod.git/" PKG_URL="http://ftp.kernel.org/pub/linux/utils/kernel/kmod/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_BUILD_DEPENDS_TARGET="toolchain" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="kmod offers the needed flexibility and fine grained control over insertion, removal, configuration and listing of kernel modules." PKG_LONGDESC="kmod offers the needed flexibility and fine grained control over insertion, removal, configuration and listing of kernel modules." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +PKG_CONFIGURE_OPTS_TARGET="--enable-tools \ + --enable-logging \ + --disable-debug \ + --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf \ + --disable-manpages \ + --with-gnu-ld \ + --without-xz \ + --without-zlib" + +post_makeinstall_target() { +# make symlinks for compatibility + mkdir -p $INSTALL/sbin + ln -sf /usr/bin/kmod $INSTALL/sbin/lsmod + ln -sf /usr/bin/kmod $INSTALL/sbin/insmod + ln -sf /usr/bin/kmod $INSTALL/sbin/rmmod + ln -sf /usr/bin/kmod $INSTALL/sbin/modinfo + ln -sf /usr/bin/kmod $INSTALL/sbin/modprobe + +# add system modprobe.d dir + mkdir -p $INSTALL/etc/modprobe.d + cp $PKG_DIR/modprobe.d/* $INSTALL/etc/modprobe.d + +# add user modprobe.d dir + mkdir -p $INSTALL/usr/config/modprobe.d +}