diff --git a/packages/addons/multimedia/makemkv/changelog.txt b/packages/addons/multimedia/makemkv/changelog.txt index c0754ab8a7..8504b40552 100644 --- a/packages/addons/multimedia/makemkv/changelog.txt +++ b/packages/addons/multimedia/makemkv/changelog.txt @@ -1,3 +1,6 @@ +3.0.4 +- update to makemkv-1.8.0 + 3.0.3 - update to makemkv-1.7.10 diff --git a/packages/addons/multimedia/makemkv/meta b/packages/addons/multimedia/makemkv/meta index 4d2871caf3..c69ce17f6d 100644 --- a/packages/addons/multimedia/makemkv/meta +++ b/packages/addons/multimedia/makemkv/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="makemkv" -PKG_VERSION="1.7.10" -PKG_REV="3" +PKG_VERSION="1.8.0" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3" diff --git a/packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.7.2-000-crosscompiling-0.1.patch b/packages/addons/multimedia/makemkv/patches.upstream/makemkv-000-crosscompiling-0.1.patch similarity index 51% rename from packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.7.2-000-crosscompiling-0.1.patch rename to packages/addons/multimedia/makemkv/patches.upstream/makemkv-000-crosscompiling-0.1.patch index b34d0b7881..e2ca9f4ce5 100644 --- a/packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.7.2-000-crosscompiling-0.1.patch +++ b/packages/addons/multimedia/makemkv/patches.upstream/makemkv-000-crosscompiling-0.1.patch @@ -1,14 +1,13 @@ -diff -Naur makemkv-1.6.10/lib/makefile.linux makemkv-1.6.10.patch/lib/makefile.linux ---- makemkv-1.6.10/lib/makefile.linux 2011-05-29 23:17:48.000000000 +0200 -+++ makemkv-1.6.10.patch/lib/makefile.linux 2011-05-30 15:29:15.510417904 +0200 -@@ -1,11 +1,11 @@ +diff --git a/lib/makefile.linux b/lib/makefile.linux +index b3b5afa..07322ad 100644 +--- a/lib/makefile.linux ++++ b/lib/makefile.linux +@@ -1,10 +1,10 @@ include makefile.common -GCC=gcc --RCC=rcc +GCC:=gcc -+RCC:=rcc MOC=$(strip $(shell which moc-qt4)) ifeq ($(MOC),) -MOC=moc @@ -16,8 +15,8 @@ diff -Naur makemkv-1.6.10/lib/makefile.linux makemkv-1.6.10.patch/lib/makefile.l endif CXXOPTS=-Os -D_GNU_SOURCE -D_linux_ -@@ -14,7 +14,7 @@ - BUILDINFO_BUILD_DATE=$(shell date) +@@ -16,7 +16,7 @@ PREFIX=/usr + LIBDIR=${PREFIX}/lib -all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv diff --git a/packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.7.2-001-crosscompiling-objcopy.patch b/packages/addons/multimedia/makemkv/patches.upstream/makemkv-001-crosscompiling-objcopy.patch similarity index 100% rename from packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.7.2-001-crosscompiling-objcopy.patch rename to packages/addons/multimedia/makemkv/patches.upstream/makemkv-001-crosscompiling-objcopy.patch diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt index 5008331f93..add2dbfaec 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt @@ -1,3 +1,6 @@ +3.0.5 +- rebuild. configobj included + 3.0.4 - update to SickBeard-4e57625 - update to CouchPotatoServer-a49a00a diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta index 27762494d4..ac17103e84 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta @@ -20,7 +20,7 @@ PKG_NAME="SABnzbd-Suite" PKG_VERSION="3.0" -PKG_REV="4" +PKG_REV="5" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.openelec.tv" diff --git a/packages/debug/iftop/build b/packages/debug/iftop/build index bb6dee2597..18c8890abf 100755 --- a/packages/debug/iftop/build +++ b/packages/debug/iftop/build @@ -24,7 +24,7 @@ #strip_lto -export LIBS="-lpthread -ltinfo -lusb-1.0" +export LIBS="-lpthread -ltinfo" cd $PKG_BUILD diff --git a/packages/debug/iftop/meta b/packages/debug/iftop/meta index 6ad4fefc5c..eb58ca6b48 100644 --- a/packages/debug/iftop/meta +++ b/packages/debug/iftop/meta @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://htop.sourceforge.net/" PKG_URL="http://www.ex-parrot.com/pdw/iftop/download/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="ncurses" -PKG_BUILD_DEPENDS="toolchain ncurses libusb libpcap" +PKG_BUILD_DEPENDS="toolchain ncurses libpcap" PKG_PRIORITY="optional" PKG_SECTION="debug/tools" PKG_SHORTDESC="iftop: display bandwidth usage on an interface" diff --git a/packages/devel/libpcap/build b/packages/devel/libpcap/build index d34049aa7f..25f54bb4ac 100755 --- a/packages/devel/libpcap/build +++ b/packages/devel/libpcap/build @@ -29,6 +29,7 @@ cd $BUILD/$1* sed -i -e 's/ac_cv_linux_vers=unknown/ac_cv_linux_vers=2/' configure LIBS="-lpthread" \ +ac_cv_header_libusb_1_0_libusb_h=no \ ./configure \ --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/devel/newt/build b/packages/devel/newt/build index 3273d7fb02..fd6bee44c3 100755 --- a/packages/devel/newt/build +++ b/packages/devel/newt/build @@ -29,6 +29,8 @@ cd $PKG_BUILD --exec-prefix=/usr \ --sysconfdir=/etc \ --datadir=/usr/share \ + --without-python \ + --without-tcl make $MAKEINSTALL diff --git a/packages/devel/slang/build b/packages/devel/slang/build index d22dd078f0..f79f129022 100755 --- a/packages/devel/slang/build +++ b/packages/devel/slang/build @@ -31,6 +31,12 @@ cd $PKG_BUILD --exec-prefix=/usr \ --sysconfdir=/etc \ --datadir=/usr/share \ + --without-iconv \ + --without-onig \ + --without-pcre \ + --without-png \ + --without-z \ + --without-x \ make $MAKEINSTALL diff --git a/packages/linux/patches/3.6.11/linux-010-perf_crosscompiling.patch b/packages/linux/patches/3.6.11/linux-010-perf_crosscompiling.patch new file mode 100644 index 0000000000..a4a1c918b4 --- /dev/null +++ b/packages/linux/patches/3.6.11/linux-010-perf_crosscompiling.patch @@ -0,0 +1,12 @@ +diff -Naur linux-3.6.11/tools/perf/Makefile linux-3.6.11.patch/tools/perf/Makefile +--- linux-3.6.11/tools/perf/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-3.6.11.patch/tools/perf/Makefile 2013-03-06 16:30:43.107805512 +0100 +@@ -496,8 +496,6 @@ + msg := $(warning newt not found, disables TUI support. Please install newt-devel or libnewt-dev); + BASIC_CFLAGS += -DNO_NEWT_SUPPORT + else +- # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h +- BASIC_CFLAGS += -I/usr/include/slang + EXTLIBS += -lnewt -lslang + LIB_OBJS += $(OUTPUT)ui/setup.o + LIB_OBJS += $(OUTPUT)ui/browser.o diff --git a/packages/linux/patches/3.7.10/linux-010-perf_crosscompiling.patch b/packages/linux/patches/3.7.10/linux-010-perf_crosscompiling.patch new file mode 100644 index 0000000000..f61031edc6 --- /dev/null +++ b/packages/linux/patches/3.7.10/linux-010-perf_crosscompiling.patch @@ -0,0 +1,12 @@ +diff -Naur linux-3.7.10/tools/perf/Makefile linux-3.7.10.patch/tools/perf/Makefile +--- linux-3.7.10/tools/perf/Makefile 2013-02-27 18:22:04.000000000 +0100 ++++ linux-3.7.10.patch/tools/perf/Makefile 2013-03-06 16:36:15.633521884 +0100 +@@ -591,8 +591,6 @@ + ifneq ($(call try-cc,$(SOURCE_NEWT),$(FLAGS_NEWT)),y) + msg := $(warning newt not found, disables TUI support. Please install newt-devel or libnewt-dev); + else +- # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h +- BASIC_CFLAGS += -I/usr/include/slang + BASIC_CFLAGS += -DNEWT_SUPPORT + EXTLIBS += -lnewt -lslang + LIB_OBJS += $(OUTPUT)ui/setup.o diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.19-PR2382.patch b/packages/mediacenter/xbmc/patches/xbmc-990.19-PR2382.patch new file mode 100644 index 0000000000..988377325b --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-990.19-PR2382.patch @@ -0,0 +1,46 @@ +From eb4ae32119a83716d7fb930381d2848c02383cea Mon Sep 17 00:00:00 2001 +From: fritsch +Date: Wed, 6 Mar 2013 07:52:59 +0100 +Subject: [PATCH] AE: Fix menu sounds by decreasing buffer(max 200 ms) and + periodSize(50 ms) + +--- + xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +index 821bd2e..21891a5 100644 +--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp ++++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +@@ -332,18 +332,19 @@ bool CAESinkALSA::InitializeHW(AEAudioFormat &format) + snd_pcm_hw_params_get_period_size_max(hw_params, &periodSize, NULL); + + /* +- We want to make sure, that we have approx 500 to 800 ms Buffer with +- a periodSize of approx 100 ms. +- It is calced: +- periodSize = sampleRate / 10 +- buffersize = periodSize * 1 frame * 8. ++ We want to make sure, that we have max 200 ms Buffer with ++ a periodSize of approx 50 ms. Choosing a higher bufferSize ++ will cause problems with menu sounds. Buffer will be increased ++ after those are fixed. ++ periodSize = sampleRate / 20 ++ bufferSize = periodSize * 1 frame * 4. + */ +- periodSize = std::min(periodSize, (snd_pcm_uframes_t) sampleRate / 10); +- bufferSize = std::min(bufferSize, (snd_pcm_uframes_t) periodSize * 8); ++ periodSize = std::min(periodSize, (snd_pcm_uframes_t) sampleRate / 20); ++ bufferSize = std::min(bufferSize, (snd_pcm_uframes_t) periodSize * 4); + + /* +- According to upstream we should set buffer size first - so make sure it is always at least +- double of period size to not get underruns ++ According to upstream we should set buffer size first - so make sure it is always at least ++ double of period size to not get underruns + */ + periodSize = std::min(periodSize, bufferSize / 2); + +-- +1.7.10 + diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.50-disable-alt-tab.patch b/packages/mediacenter/xbmc/patches/xbmc-995.50-disable-alt-tab.patch new file mode 100644 index 0000000000..2ee2b7a271 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-995.50-disable-alt-tab.patch @@ -0,0 +1,12 @@ +diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp +index ed31c04..34fcfae 100644 +--- a/xbmc/windowing/WinEventsX11.cpp ++++ b/xbmc/windowing/WinEventsX11.cpp +@@ -709,7 +709,6 @@ bool CWinEventsX11::ProcessShortcuts(XBMC_Event& event) + switch(event.key.keysym.sym) + { + case XBMCK_TAB: // ALT+TAB to minimize/hide +- g_application.Minimize(); + return true; + + default: diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.51-remove-windowed-display-mode.patch b/packages/mediacenter/xbmc/patches/xbmc-995.51-remove-windowed-display-mode.patch new file mode 100644 index 0000000000..88d8ac4a2b --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-995.51-remove-windowed-display-mode.patch @@ -0,0 +1,13 @@ +diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp +index cbf0acb..f789e18 100644 +--- a/xbmc/settings/GUIWindowSettingsCategory.cpp ++++ b/xbmc/settings/GUIWindowSettingsCategory.cpp +@@ -2434,7 +2434,7 @@ DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RES + pControl->Clear(); + + CStdString strScreen; +- if (g_advancedSettings.m_canWindowed) ++ if (g_advancedSettings.m_canWindowed && !g_application.IsStandAlone()) + pControl->AddLabel(g_localizeStrings.Get(242), -1); + + #if !defined(HAS_GLX) diff --git a/packages/sysutils/util-linux/scripts/32_swapfile b/packages/sysutils/util-linux/scripts/32_swapfile index 0a21f425d0..42caea6a12 100644 --- a/packages/sysutils/util-linux/scripts/32_swapfile +++ b/packages/sysutils/util-linux/scripts/32_swapfile @@ -45,6 +45,6 @@ fi for i in $SWAP; do swapon -p 10000 $SWAP 2>&1 > /dev/null done - sysctl -w vm.swappiness=1 2>&1 > /dev/null + sysctl -w vm.swappiness=10 2>&1 > /dev/null fi )& diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/meta b/packages/x11/driver/xf86-video-nvidia-legacy/meta index 782f54b1b2..874cb62844 100644 --- a/packages/x11/driver/xf86-video-nvidia-legacy/meta +++ b/packages/x11/driver/xf86-video-nvidia-legacy/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-nvidia-legacy" -PKG_VERSION="304.64" +PKG_VERSION="304.84" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/make-use-of-the-new-uapi-framework.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/make-use-of-the-new-uapi-framework.patch deleted file mode 100644 index 852021d657..0000000000 --- a/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/make-use-of-the-new-uapi-framework.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1e3d34ce7d8c4912c08386589843fcc4ba4d38bf Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Wed, 7 Nov 2012 12:03:46 +0100 -Subject: [PATCH 1/2] Make use of the new uapi framework - ---- - conftest.sh | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/kernel/conftest.sh b/kernel/conftest.sh -index 388e268..8eff4d7 100755 ---- a/kernel/conftest.sh -+++ b/kernel/conftest.sh -@@ -20,6 +20,7 @@ ARCH=$3 - ISYSTEM=`$CC -print-file-name=include 2> /dev/null` - SOURCES=$4 - HEADERS=$SOURCES/include -+HEADERSA=$SOURCES/include/uapi - OUTPUT=$5 - XEN_PRESENT=1 - -@@ -118,7 +119,7 @@ build_cflags() { - fi - fi - -- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" -+ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS" - - test_xen - -@@ -146,10 +147,10 @@ build_cflags() { - fi - fi - -- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" -+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS" - - if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated" -+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi" - elif [ "$ARCH" = "arm" ]; then - CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated" - fi --- -1.7.9.5 - diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch deleted file mode 100644 index 84bd164e76..0000000000 --- a/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fed1fa17202cf13bf80bbbad3bf0ffdfd192df42 Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Wed, 7 Nov 2012 12:11:02 +0100 -Subject: [PATCH 1/1] Replace VM_RESERVED with VM_DONTEXPAND and VM_DONTDUMP - ---- - nv-mmap.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/kernel/nv-mmap.c b/kernel/nv-mmap.c -index acc02ec..b2d5cdb 100644 ---- a/kernel/nv-mmap.c -+++ b/kernel/nv-mmap.c -@@ -463,7 +463,11 @@ int nv_kern_mmap( - NV_PRINT_AT(NV_DBG_MEMINFO, at); - nv_vm_list_page_count(&at->page_table[i], pages); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) -+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP)); -+#else - vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED); -+#endif - - #if defined(VM_DRIVER_PAGES) - vma->vm_flags |= VM_DRIVER_PAGES; --- -1.7.9.5 - diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta index 52bea1e52e..7baba9f3ca 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="304.64" +PKG_VERSION="304.84" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/make-use-of-the-new-uapi-framework.patch b/packages/x11/driver/xf86-video-nvidia/patches.upstream/make-use-of-the-new-uapi-framework.patch deleted file mode 100644 index 852021d657..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/patches.upstream/make-use-of-the-new-uapi-framework.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1e3d34ce7d8c4912c08386589843fcc4ba4d38bf Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Wed, 7 Nov 2012 12:03:46 +0100 -Subject: [PATCH 1/2] Make use of the new uapi framework - ---- - conftest.sh | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/kernel/conftest.sh b/kernel/conftest.sh -index 388e268..8eff4d7 100755 ---- a/kernel/conftest.sh -+++ b/kernel/conftest.sh -@@ -20,6 +20,7 @@ ARCH=$3 - ISYSTEM=`$CC -print-file-name=include 2> /dev/null` - SOURCES=$4 - HEADERS=$SOURCES/include -+HEADERSA=$SOURCES/include/uapi - OUTPUT=$5 - XEN_PRESENT=1 - -@@ -118,7 +119,7 @@ build_cflags() { - fi - fi - -- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" -+ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS" - - test_xen - -@@ -146,10 +147,10 @@ build_cflags() { - fi - fi - -- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" -+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS" - - if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated" -+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi" - elif [ "$ARCH" = "arm" ]; then - CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated" - fi --- -1.7.9.5 - diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch b/packages/x11/driver/xf86-video-nvidia/patches.upstream/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch deleted file mode 100644 index 84bd164e76..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/patches.upstream/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fed1fa17202cf13bf80bbbad3bf0ffdfd192df42 Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Wed, 7 Nov 2012 12:11:02 +0100 -Subject: [PATCH 1/1] Replace VM_RESERVED with VM_DONTEXPAND and VM_DONTDUMP - ---- - nv-mmap.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/kernel/nv-mmap.c b/kernel/nv-mmap.c -index acc02ec..b2d5cdb 100644 ---- a/kernel/nv-mmap.c -+++ b/kernel/nv-mmap.c -@@ -463,7 +463,11 @@ int nv_kern_mmap( - NV_PRINT_AT(NV_DBG_MEMINFO, at); - nv_vm_list_page_count(&at->page_table[i], pages); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) -+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP)); -+#else - vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED); -+#endif - - #if defined(VM_DRIVER_PAGES) - vma->vm_flags |= VM_DRIVER_PAGES; --- -1.7.9.5 - diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 815da80838..18b29c687a 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -485,12 +485,13 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y # x86 CPU frequency scaling drivers # # CONFIG_X86_PCC_CPUFREQ is not set -# CONFIG_X86_ACPI_CPUFREQ is not set +CONFIG_X86_ACPI_CPUFREQ=y # CONFIG_X86_POWERNOW_K6 is not set # CONFIG_X86_POWERNOW_K7 is not set +# CONFIG_X86_POWERNOW_K8 is not set # CONFIG_X86_GX_SUSPMOD is not set # CONFIG_X86_SPEEDSTEP_CENTRINO is not set -CONFIG_X86_SPEEDSTEP_ICH=y +# CONFIG_X86_SPEEDSTEP_ICH is not set # CONFIG_X86_SPEEDSTEP_SMI is not set # CONFIG_X86_P4_CLOCKMOD is not set # CONFIG_X86_CPUFREQ_NFORCE2 is not set @@ -501,8 +502,7 @@ CONFIG_X86_SPEEDSTEP_ICH=y # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=y -# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set +# CONFIG_X86_SPEEDSTEP_LIB is not set CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y