From 967f918d78cf7ffa0e7cddcfdcd8ae37594ab95e Mon Sep 17 00:00:00 2001 From: Lionel Widdifield Date: Wed, 21 Sep 2011 12:35:58 -0700 Subject: [PATCH 01/17] optimize=normal gcc option cleanup modified: packages/audio/libmad/build new file: packages/audio/libmad/patches/libmad-0.15.1b-cflags-O2.patch new file: packages/audio/libmad/patches/libmad-0.15.1b-cflags.patch --- packages/audio/libmad/build | 7 +- .../patches/libmad-0.15.1b-cflags-O2.patch | 12 ++ .../patches/libmad-0.15.1b-cflags.patch | 146 ++++++++++++++++++ 3 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 packages/audio/libmad/patches/libmad-0.15.1b-cflags-O2.patch create mode 100644 packages/audio/libmad/patches/libmad-0.15.1b-cflags.patch diff --git a/packages/audio/libmad/build b/packages/audio/libmad/build index 8f4bbf759c..6d5246b01e 100755 --- a/packages/audio/libmad/build +++ b/packages/audio/libmad/build @@ -24,6 +24,10 @@ cd $PKG_BUILD +if [ $TARGET_ARCH == "x86_64" ] ; then + MAD_OPTIONS="--enable-accuracy --enable-fpm=64bit" +fi + # some fixes for autoreconf touch NEWS AUTHORS ChangeLog do_autoreconf @@ -32,7 +36,8 @@ cd $PKG_BUILD --build=$HOST_NAME \ --prefix=/usr \ --disable-static \ - --enable-shared + --enable-shared \ + $MAD_OPTIONS make diff --git a/packages/audio/libmad/patches/libmad-0.15.1b-cflags-O2.patch b/packages/audio/libmad/patches/libmad-0.15.1b-cflags-O2.patch new file mode 100644 index 0000000000..61b4b13bd7 --- /dev/null +++ b/packages/audio/libmad/patches/libmad-0.15.1b-cflags-O2.patch @@ -0,0 +1,12 @@ +diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac +--- libmad-0.15.1b-orig/configure.ac 2007-07-01 12:58:13.000000000 -0600 ++++ libmad-0.15.1b/configure.ac 2007-07-01 12:59:13.000000000 -0600 +@@ -105,7 +105,7 @@ + shift + ;; + -O2) +- optimize="-O" ++ optimize="-O2" + shift + ;; + -fomit-frame-pointer) diff --git a/packages/audio/libmad/patches/libmad-0.15.1b-cflags.patch b/packages/audio/libmad/patches/libmad-0.15.1b-cflags.patch new file mode 100644 index 0000000000..2ec44e3445 --- /dev/null +++ b/packages/audio/libmad/patches/libmad-0.15.1b-cflags.patch @@ -0,0 +1,146 @@ +diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac +--- libmad-0.15.1b-orig/configure.ac 2007-06-30 20:22:31.000000000 -0600 ++++ libmad-0.15.1b/configure.ac 2007-06-30 20:25:31.000000000 -0600 +@@ -122,74 +122,74 @@ + esac + done + +-if test "$GCC" = yes +-then +- if test -z "$arch" +- then +- case "$host" in +- i386-*) ;; +- i?86-*) arch="-march=i486" ;; +- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;; +- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;; +- powerpc-*) ;; +- mips*-agenda-*) arch="-mcpu=vr4100" ;; +- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;; +- esac +- fi +- +- case "$optimize" in +- -O|"-O "*) +- optimize="-O" +- optimize="$optimize -fforce-mem" +- optimize="$optimize -fforce-addr" +- : #x optimize="$optimize -finline-functions" +- : #- optimize="$optimize -fstrength-reduce" +- optimize="$optimize -fthread-jumps" +- optimize="$optimize -fcse-follow-jumps" +- optimize="$optimize -fcse-skip-blocks" +- : #x optimize="$optimize -frerun-cse-after-loop" +- : #x optimize="$optimize -frerun-loop-opt" +- : #x optimize="$optimize -fgcse" +- optimize="$optimize -fexpensive-optimizations" +- optimize="$optimize -fregmove" +- : #* optimize="$optimize -fdelayed-branch" +- : #x optimize="$optimize -fschedule-insns" +- optimize="$optimize -fschedule-insns2" +- : #? optimize="$optimize -ffunction-sections" +- : #? optimize="$optimize -fcaller-saves" +- : #> optimize="$optimize -funroll-loops" +- : #> optimize="$optimize -funroll-all-loops" +- : #x optimize="$optimize -fmove-all-movables" +- : #x optimize="$optimize -freduce-all-givs" +- : #? optimize="$optimize -fstrict-aliasing" +- : #* optimize="$optimize -fstructure-noalias" +- +- case "$host" in +- arm*-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- mips*-*) +- optimize="$optimize -fstrength-reduce" +- optimize="$optimize -finline-functions" +- ;; +- i?86-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- powerpc-apple-*) +- # this triggers an internal compiler error with gcc2 +- : #optimize="$optimize -fstrength-reduce" +- +- # this is really only beneficial with gcc3 +- : #optimize="$optimize -finline-functions" +- ;; +- *) +- # this sometimes provokes bugs in gcc 2.95.2 +- : #optimize="$optimize -fstrength-reduce" +- ;; +- esac +- ;; +- esac +-fi ++#if test "$GCC" = yes ++#then ++# if test -z "$arch" ++# then ++# case "$host" in ++# i386-*) ;; ++# i?86-*) arch="-march=i486" ;; ++# arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;; ++# armv4*-*) arch="-march=armv4 -mtune=strongarm" ;; ++# powerpc-*) ;; ++# mips*-agenda-*) arch="-mcpu=vr4100" ;; ++# mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;; ++# esac ++# fi ++# ++# case "$optimize" in ++# -O|"-O "*) ++# optimize="-O" ++# optimize="$optimize -fforce-mem" ++# optimize="$optimize -fforce-addr" ++# : #x optimize="$optimize -finline-functions" ++# : #- optimize="$optimize -fstrength-reduce" ++# optimize="$optimize -fthread-jumps" ++# optimize="$optimize -fcse-follow-jumps" ++# optimize="$optimize -fcse-skip-blocks" ++# : #x optimize="$optimize -frerun-cse-after-loop" ++# : #x optimize="$optimize -frerun-loop-opt" ++# : #x optimize="$optimize -fgcse" ++# optimize="$optimize -fexpensive-optimizations" ++# optimize="$optimize -fregmove" ++# : #* optimize="$optimize -fdelayed-branch" ++# : #x optimize="$optimize -fschedule-insns" ++# optimize="$optimize -fschedule-insns2" ++# : #? optimize="$optimize -ffunction-sections" ++# : #? optimize="$optimize -fcaller-saves" ++# : #> optimize="$optimize -funroll-loops" ++# : #> optimize="$optimize -funroll-all-loops" ++# : #x optimize="$optimize -fmove-all-movables" ++# : #x optimize="$optimize -freduce-all-givs" ++# : #? optimize="$optimize -fstrict-aliasing" ++# : #* optimize="$optimize -fstructure-noalias" ++# ++# case "$host" in ++# arm*-*) ++# optimize="$optimize -fstrength-reduce" ++# ;; ++# mips*-*) ++# optimize="$optimize -fstrength-reduce" ++# optimize="$optimize -finline-functions" ++# ;; ++# i?86-*) ++# optimize="$optimize -fstrength-reduce" ++# ;; ++# powerpc-apple-*) ++# # this triggers an internal compiler error with gcc2 ++# : #optimize="$optimize -fstrength-reduce" ++# ++# # this is really only beneficial with gcc3 ++# : #optimize="$optimize -finline-functions" ++# ;; ++# *) ++# # this sometimes provokes bugs in gcc 2.95.2 ++# : #optimize="$optimize -fstrength-reduce" ++# ;; ++# esac ++# ;; ++# esac ++#fi + + case "$host" in + mips*-agenda-*) From a729446e0cd044518419fb72634d2ea5eea97150 Mon Sep 17 00:00:00 2001 From: Lionel Widdifield Date: Wed, 21 Sep 2011 14:54:50 -0700 Subject: [PATCH 02/17] packages/lang/Python/build: fix for crosscompile --- packages/lang/Python/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/lang/Python/build b/packages/lang/Python/build index 165242fe80..91893fdbc5 100755 --- a/packages/lang/Python/build +++ b/packages/lang/Python/build @@ -95,6 +95,7 @@ LDFLAGS="$LDFLAGS -lexpat -lffi" \ make -j1 CC="$TARGET_CC" \ HOSTPYTHON=../.objdir-host/hostpython \ HOSTPGEN=../.objdir-host/hostpgen \ + RUNSHARED="LD_LIBRARY_PATH=../.objdir-host:" \ BLDSHARED="$CC -shared" \ PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \ CROSS_COMPILE="$TARGET_NAME" \ @@ -106,6 +107,7 @@ make -j1 CC="$TARGET_CC" \ DESTDIR=$SYSROOT_PREFIX \ HOSTPYTHON=../.objdir-host/hostpython \ HOSTPGEN=../.objdir-host/hostpgen \ + RUNSHARED="LD_LIBRARY_PATH=../.objdir-host:" \ BLDSHARED="$CC -shared" \ PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \ CROSS_COMPILE="$TARGET_NAME" \ From 8621a04525b6f7eff691d89214f8fcb2d7f4cb00 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Sep 2011 14:37:51 +0200 Subject: [PATCH 03/17] bluez: enable audio support, fix als modules install dir Signed-off-by: Stephan Raue --- packages/network/bluez/build | 2 +- packages/network/bluez/install | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/network/bluez/build b/packages/network/bluez/build index f61562fd81..33e97f9f70 100755 --- a/packages/network/bluez/build +++ b/packages/network/bluez/build @@ -52,7 +52,7 @@ cd $PKG_BUILD --disable-proximity \ --disable-serial \ --enable-input \ - --disable-audio \ + --enable-audio \ --enable-service \ --enable-health \ --disable-pnat \ diff --git a/packages/network/bluez/install b/packages/network/bluez/install index 54efddd911..121eb88ac7 100755 --- a/packages/network/bluez/install +++ b/packages/network/bluez/install @@ -46,8 +46,8 @@ mkdir -p $INSTALL/lib/udev/rules.d mkdir -p $INSTALL/usr/lib cp $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib -mkdir -p $INSTALL/usr/lib/alsa-lib - cp $PKG_BUILD/audio/.libs/*.so $INSTALL/usr/lib/alsa-lib +mkdir -p $INSTALL/usr/lib/alsa + cp $PKG_BUILD/audio/.libs/*.so $INSTALL/usr/lib/alsa mkdir -p $INSTALL/usr/lib/bluetooth/plugins From 48d788ca527423f42390c2b6d75f150def52f869 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Sep 2011 17:43:16 +0200 Subject: [PATCH 04/17] xbmc: fix cputemp script, thanks to acalvo Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/scripts/cputemp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc/scripts/cputemp b/packages/mediacenter/xbmc/scripts/cputemp index a9e7950a8b..eb129f3e74 100755 --- a/packages/mediacenter/xbmc/scripts/cputemp +++ b/packages/mediacenter/xbmc/scripts/cputemp @@ -23,7 +23,7 @@ TEMP="0" if [ -f /usr/bin/sensors ]; then - TEMP=`/usr/bin/sensors -u | tail -n6 | grep temp._input | awk '{print $2 }' |awk '{printf("%d\n",$1 + 0.5);}'` + TEMP=`/usr/bin/sensors -u | tail -n7 | grep temp._input | awk '{print $2 }' |awk '{printf("%d\n",$1 + 0.5);}'` fi echo "${TEMP} C" From c38a210af13316da2705364c702c6ebe10312cdc Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Sep 2011 18:07:43 +0200 Subject: [PATCH 05/17] projects/*/linux: add reiserfs and xfs kernel support Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 14 +++++++++++--- projects/Fusion/linux/linux.i386.conf | 14 +++++++++++--- projects/Fusion/linux/linux.x86_64.conf | 14 +++++++++++--- projects/Generic/linux/linux.i386.conf | 14 +++++++++++--- projects/Generic_OSS/linux/linux.i386.conf | 14 +++++++++++--- projects/ION/linux/linux.i386.conf | 14 +++++++++++--- projects/ION/linux/linux.x86_64.conf | 14 +++++++++++--- projects/Intel/linux/linux.i386.conf | 14 +++++++++++--- projects/Intel/linux/linux.x86_64.conf | 14 +++++++++++--- projects/Ultra/linux/linux.x86_64.conf | 12 ++++++++++-- 10 files changed, 109 insertions(+), 29 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index f4dafef112..d8f048901c 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc6 Kernel Configuration +# Linux/i386 3.1.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2396,17 +2396,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set CONFIG_JFS_FS=y # CONFIG_JFS_POSIX_ACL is not set # CONFIG_JFS_SECURITY is not set # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index df06c48df9..1b66b15921 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc6 Kernel Configuration +# Linux/i386 3.1.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2665,17 +2665,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set CONFIG_JFS_FS=y # CONFIG_JFS_POSIX_ACL is not set # CONFIG_JFS_SECURITY is not set # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index 77be101ae4..145c47ed49 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.0-rc6 Kernel Configuration +# Linux/x86_64 3.1.0-rc7 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2616,17 +2616,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set CONFIG_JFS_FS=y # CONFIG_JFS_POSIX_ACL is not set # CONFIG_JFS_SECURITY is not set # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 8e32229a65..98e11ecac7 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc6 Kernel Configuration +# Linux/i386 3.1.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2904,17 +2904,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set CONFIG_JFS_FS=y # CONFIG_JFS_POSIX_ACL is not set # CONFIG_JFS_SECURITY is not set # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index ddb5dd8551..51eeb8b4ce 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc6 Kernel Configuration +# Linux/i386 3.1.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2907,17 +2907,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set CONFIG_JFS_FS=y # CONFIG_JFS_POSIX_ACL is not set # CONFIG_JFS_SECURITY is not set # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 2261fd030b..730f528b4f 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc6 Kernel Configuration +# Linux/i386 3.1.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2703,17 +2703,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set CONFIG_JFS_FS=y # CONFIG_JFS_POSIX_ACL is not set # CONFIG_JFS_SECURITY is not set # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 473117ccce..ec3ce248b0 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.0-rc6 Kernel Configuration +# Linux/x86_64 3.1.0-rc7 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2655,17 +2655,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set CONFIG_JFS_FS=y # CONFIG_JFS_POSIX_ACL is not set # CONFIG_JFS_SECURITY is not set # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 287c4a3c5e..99564d869a 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc6 Kernel Configuration +# Linux/i386 3.1.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2769,17 +2769,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set CONFIG_JFS_FS=y # CONFIG_JFS_POSIX_ACL is not set # CONFIG_JFS_SECURITY is not set # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index ecd12f4b21..cd9926e619 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.0-rc6 Kernel Configuration +# Linux/x86_64 3.1.0-rc7 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2717,17 +2717,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set CONFIG_JFS_FS=y # CONFIG_JFS_POSIX_ACL is not set # CONFIG_JFS_SECURITY is not set # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index eb0b9ef963..08505cb013 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -2463,17 +2463,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set CONFIG_JFS_FS=y # CONFIG_JFS_POSIX_ACL is not set # CONFIG_JFS_SECURITY is not set # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y From 292c2df0e454d73393a0ae2f4afa3e0a551418b8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Sep 2011 18:15:52 +0200 Subject: [PATCH 06/17] busybox: add applet 'time' Signed-off-by: Stephan Raue --- packages/sysutils/busybox/config/busybox.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index bdb144c03c..9cb258f583 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.19.2 -# Wed Sep 28 04:19:49 2011 +# Wed Sep 28 18:13:56 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -704,7 +704,7 @@ CONFIG_RFKILL=y # CONFIG_STRINGS is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_TIME is not set +CONFIG_TIME=y # CONFIG_TIMEOUT is not set CONFIG_TTYSIZE=y # CONFIG_VOLNAME is not set From c5b78d4a9cffdc289c7dcfbc15fcee0465c2bc95 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Sep 2011 18:26:20 +0200 Subject: [PATCH 07/17] xbmc: change cputemp script again, maybe sometime we have tried all variants :-) thanks to ultra_man Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/scripts/cputemp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc/scripts/cputemp b/packages/mediacenter/xbmc/scripts/cputemp index eb129f3e74..b61b416323 100755 --- a/packages/mediacenter/xbmc/scripts/cputemp +++ b/packages/mediacenter/xbmc/scripts/cputemp @@ -23,7 +23,7 @@ TEMP="0" if [ -f /usr/bin/sensors ]; then - TEMP=`/usr/bin/sensors -u | tail -n7 | grep temp._input | awk '{print $2 }' |awk '{printf("%d\n",$1 + 0.5);}'` + TEMP=`/usr/bin/sensors -u | grep -A 1 "Core " | tail -n 1 | awk '{printf("%d\n",$2 + 0.5);}'` fi echo "${TEMP} C" From c2f3fa56a3b2e9efe99f40c1ebe209d19998ddcb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Sep 2011 21:05:24 +0200 Subject: [PATCH 08/17] curl: setup and install curl-config in toolchain Signed-off-by: Stephan Raue --- packages/web/curl/build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/web/curl/build b/packages/web/curl/build index 041532e9d8..ec125577b5 100755 --- a/packages/web/curl/build +++ b/packages/web/curl/build @@ -85,3 +85,8 @@ ac_cv_header_librtmp_rtmp_h=yes \ make $MAKEINSTALL + +$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \ + $SYSROOT_PREFIX/usr/bin/$1-config + +mv $SYSROOT_PREFIX/usr/bin/$1-config $ROOT/$TOOLCHAIN/bin From efe0a2f1fbf24c480152bdc4ec6e1d94bf417e44 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Sep 2011 22:29:35 +0200 Subject: [PATCH 09/17] projects/*/linux: add W83627EHF hardware monitoring driver Signed-off-by: Stephan Raue --- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic_OSS/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.i386.conf | 4 ++-- projects/ION/linux/linux.x86_64.conf | 4 ++-- projects/Intel/linux/linux.i386.conf | 4 ++-- projects/Intel/linux/linux.x86_64.conf | 4 ++-- projects/Ultra/linux/linux.x86_64.conf | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 98e11ecac7..630c7a7561 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1653,7 +1653,7 @@ CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_W83L785TS is not set # CONFIG_SENSORS_W83L786NG is not set # CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set +CONFIG_SENSORS_W83627EHF=m # CONFIG_SENSORS_APPLESMC is not set # diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 51eeb8b4ce..b35b57948c 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -1654,7 +1654,7 @@ CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_W83L785TS is not set # CONFIG_SENSORS_W83L786NG is not set # CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set +CONFIG_SENSORS_W83627EHF=m # CONFIG_SENSORS_APPLESMC is not set # diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 730f528b4f..e51e92e4cb 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1463,7 +1463,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_MAX17042 is not set # CONFIG_CHARGER_MAX8903 is not set CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set +CONFIG_HWMON_VID=y # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -1564,7 +1564,7 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_W83L785TS is not set # CONFIG_SENSORS_W83L786NG is not set # CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set +CONFIG_SENSORS_W83627EHF=m # CONFIG_SENSORS_APPLESMC is not set # diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index ec3ce248b0..90e837fa63 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1413,7 +1413,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_MAX17042 is not set # CONFIG_CHARGER_MAX8903 is not set CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set +CONFIG_HWMON_VID=y # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -1514,7 +1514,7 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_W83L785TS is not set # CONFIG_SENSORS_W83L786NG is not set # CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set +CONFIG_SENSORS_W83627EHF=m # CONFIG_SENSORS_APPLESMC is not set # diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 99564d869a..72da2f649b 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1506,7 +1506,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_MAX17042 is not set # CONFIG_CHARGER_MAX8903 is not set CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set +CONFIG_HWMON_VID=y # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -1607,7 +1607,7 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_W83L785TS is not set # CONFIG_SENSORS_W83L786NG is not set # CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set +CONFIG_SENSORS_W83627EHF=m # CONFIG_SENSORS_APPLESMC is not set # diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index cd9926e619..828190da92 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1458,7 +1458,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_MAX17042 is not set # CONFIG_CHARGER_MAX8903 is not set CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set +CONFIG_HWMON_VID=y # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -1559,7 +1559,7 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_W83L785TS is not set # CONFIG_SENSORS_W83L786NG is not set # CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set +CONFIG_SENSORS_W83627EHF=m # CONFIG_SENSORS_APPLESMC is not set # diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 08505cb013..3b736c4cf7 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -1331,7 +1331,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_MAX17042 is not set # CONFIG_CHARGER_MAX8903 is not set CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set +CONFIG_HWMON_VID=y # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -1432,7 +1432,7 @@ CONFIG_SENSORS_CORETEMP=y # CONFIG_SENSORS_W83L785TS is not set # CONFIG_SENSORS_W83L786NG is not set # CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set +CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_APPLESMC is not set # From 92a8ca0a7200c27e89ad2d02617124257c7ce48c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 29 Sep 2011 14:46:31 +0200 Subject: [PATCH 10/17] new package: add package 'pycurl' Signed-off-by: Stephan Raue --- packages/3rdparty/web/pycurl/build | 33 +++++++++++++++++ packages/3rdparty/web/pycurl/install | 25 +++++++++++++ packages/3rdparty/web/pycurl/meta | 36 +++++++++++++++++++ ...rl-7.19.0-fix-do_curl_reset-refcount.patch | 24 +++++++++++++ .../pycurl-7.19.0-no-static-libs.patch | 12 +++++++ .../pycurl-7.19.0-setuptools-0.1.patch | 14 ++++++++ 6 files changed, 144 insertions(+) create mode 100755 packages/3rdparty/web/pycurl/build create mode 100755 packages/3rdparty/web/pycurl/install create mode 100644 packages/3rdparty/web/pycurl/meta create mode 100644 packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch create mode 100644 packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch create mode 100644 packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch diff --git a/packages/3rdparty/web/pycurl/build b/packages/3rdparty/web/pycurl/build new file mode 100755 index 0000000000..a443bc7610 --- /dev/null +++ b/packages/3rdparty/web/pycurl/build @@ -0,0 +1,33 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" +export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" + +cd $PKG_BUILD + +python setup.py build --cross-compile +python setup.py install -O0 --no-compile --prefix /usr --root .install + +rm -rf .install/usr/bin diff --git a/packages/3rdparty/web/pycurl/install b/packages/3rdparty/web/pycurl/install new file mode 100755 index 0000000000..a9c8b9924b --- /dev/null +++ b/packages/3rdparty/web/pycurl/install @@ -0,0 +1,25 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +cp -PR $PKG_BUILD/.install/* $INSTALL diff --git a/packages/3rdparty/web/pycurl/meta b/packages/3rdparty/web/pycurl/meta new file mode 100644 index 0000000000..2f193ebdfd --- /dev/null +++ b/packages/3rdparty/web/pycurl/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="pycurl" +PKG_VERSION="7.19.0" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL-2" +PKG_SITE="http://pycurl.sourceforge.net/" +PKG_URL="http://pycurl.sourceforge.net/download/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_DEPENDS="Python distribute curl" +PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross curl" +PKG_PRIORITY="optional" +PKG_SECTION="python/web" +PKG_SHORTDESC="pycurl: a Python interface to libcurl" +PKG_LONGDESC="PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program, similar to the urllib Python module. PycURL is mature, very fast, and supports a lot of features." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch new file mode 100644 index 0000000000..7e20b15c2f --- /dev/null +++ b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch @@ -0,0 +1,24 @@ +--- a/src/pycurl.c ++++ a/src/pycurl.c +@@ -1452,6 +1452,7 @@ do_curl_reset(CurlObject *self) + } + } + ++ Py_INCREF(Py_None); + return Py_None; + } + +--- a/tests/test_internals.py ++++ a/tests/test_internals.py +@@ -245,6 +245,11 @@ if 1 and gc: + if opts.verbose >= 1: + print "Tracked objects:", len(gc.get_objects()) + ++if 1: ++ # Ensure that the refcounting error in "reset" is fixed: ++ for i in xrange(100000): ++ c = Curl() ++ c.reset() + + # /*********************************************************************** + # // done diff --git a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch new file mode 100644 index 0000000000..06ac2c1f1e --- /dev/null +++ b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch @@ -0,0 +1,12 @@ +--- pycurl/setup.py~ 2008-04-22 17:00:45.000000000 +0300 ++++ pycurl/setup.py 2008-07-03 21:53:36.000000000 +0300 +@@ -97,8 +97,7 @@ + else: + extra_compile_args.append(e) + libs = split_quoted( +- os.popen("'%s' --libs" % CURL_CONFIG).read()+\ +- os.popen("'%s' --static-libs" % CURL_CONFIG).read()) ++ os.popen("'%s' --libs" % CURL_CONFIG).read()) + for e in libs: + if e[:2] == "-l": + libraries.append(e[2:]) diff --git a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch new file mode 100644 index 0000000000..8ceba310a2 --- /dev/null +++ b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch @@ -0,0 +1,14 @@ +diff -Naur pycurl-7.19.0/setup.py pycurl-7.19.0.patch/setup.py +--- pycurl-7.19.0/setup.py 2008-09-09 19:40:34.000000000 +0200 ++++ pycurl-7.19.0.patch/setup.py 2011-09-29 02:07:22.584412664 +0200 +@@ -11,8 +11,8 @@ + + import glob, os, re, sys, string + import distutils +-from distutils.core import setup +-from distutils.extension import Extension ++from setuptools import setup ++from setuptools import Extension + from distutils.util import split_quoted + from distutils.version import LooseVersion + From 709e863fc74d6da3da907ca27d01c034592c51cd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 29 Sep 2011 14:47:10 +0200 Subject: [PATCH 11/17] new package: add initial addon 'pyload' (needs some work) Signed-off-by: Stephan Raue --- .../service/downloadmanager/pyload/addon | 32 +++++++++++++++ .../downloadmanager/pyload/changelog.txt | 2 + .../downloadmanager/pyload/icon/icon.png | Bin 0 -> 8172 bytes .../service/downloadmanager/pyload/meta | 38 ++++++++++++++++++ .../pyload/source/bin/pyload.service | 32 +++++++++++++++ .../downloadmanager/pyload/source/default.py | 23 +++++++++++ 6 files changed, 127 insertions(+) create mode 100755 packages/addons/service/downloadmanager/pyload/addon create mode 100644 packages/addons/service/downloadmanager/pyload/changelog.txt create mode 100644 packages/addons/service/downloadmanager/pyload/icon/icon.png create mode 100644 packages/addons/service/downloadmanager/pyload/meta create mode 100755 packages/addons/service/downloadmanager/pyload/source/bin/pyload.service create mode 100644 packages/addons/service/downloadmanager/pyload/source/default.py diff --git a/packages/addons/service/downloadmanager/pyload/addon b/packages/addons/service/downloadmanager/pyload/addon new file mode 100755 index 0000000000..1133121155 --- /dev/null +++ b/packages/addons/service/downloadmanager/pyload/addon @@ -0,0 +1,32 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin + cp $BUILD/unrar/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin + +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib + cp -R $BUILD/pycurl*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib + +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pyload + cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/pyload diff --git a/packages/addons/service/downloadmanager/pyload/changelog.txt b/packages/addons/service/downloadmanager/pyload/changelog.txt new file mode 100644 index 0000000000..411ed2f4c4 --- /dev/null +++ b/packages/addons/service/downloadmanager/pyload/changelog.txt @@ -0,0 +1,2 @@ +0.99.1 +- initial version pyload-0.4.7 diff --git a/packages/addons/service/downloadmanager/pyload/icon/icon.png b/packages/addons/service/downloadmanager/pyload/icon/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..72a95b740b25675204544daf43fe88b1b7e429ff GIT binary patch literal 8172 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�LX$J?>Mq=+mH90 z1#bl$dv^Z&Q^~fzdq5^e#tX=m*{2YI5d%YD=l&2lE7m@J?8t$&r^9=n7T^IuyyMbO zIq}Y;OeXdpoDO&UD-DCq6isLtAS2G1-YeFhF7JHWfVcBEcgtkwrEev&RiHGE4CMe_ zgqB6@JCp^4ftcH|ci@G4CeMPmGDlx_r`me{FUZ8mSP|Kr#PoCkW`;20Dz*AQZ9bje z_p|~J04RR$ryRHaFv!6EqdpEC3jmmi#oM>GrOt9e4n+>*f3QWV$we(ssLt?ReK%vTfa61228wJKf&%{|^9-O24vy SRsm-K0000 Date: Thu, 29 Sep 2011 17:03:19 +0200 Subject: [PATCH 12/17] v4l-utils: add Zotac ZBOX AD10 remote support Signed-off-by: Stephan Raue --- ...s-0.8.3-12-add_zbox_ad10_support-0.1.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-0.8.3-12-add_zbox_ad10_support-0.1.patch diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-0.8.3-12-add_zbox_ad10_support-0.1.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-0.8.3-12-add_zbox_ad10_support-0.1.patch new file mode 100644 index 0000000000..0a0f83c9e4 --- /dev/null +++ b/packages/sysutils/v4l-utils/patches/v4l-utils-0.8.3-12-add_zbox_ad10_support-0.1.patch @@ -0,0 +1,59 @@ +diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce +--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce 2011-09-29 16:58:43.791771663 +0200 ++++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce 2011-09-29 16:59:59.449760665 +0200 +@@ -60,6 +60,7 @@ + 0x800f046f KEY_MEDIA + 0x800f0480 KEY_BRIGHTNESSDOWN + 0x800f0481 KEY_PLAYPAUSE ++ + #xbox360 remote + 0x800f7400 KEY_NUMERIC_0 + 0x800f7401 KEY_NUMERIC_1 +@@ -124,3 +125,47 @@ + 0x800f7480 KEY_BRIGHTNESSDOWN + 0x800f7481 KEY_PLAYPAUSE + ++Zotac AD10 Remote ++0x8034048e KEY_POWER ++0x8034043d KEY_POWER ++0x80340400 KEY_NUMERIC_0 ++0x80340401 KEY_NUMERIC_1 ++0x80340402 KEY_NUMERIC_2 ++0x80340403 KEY_NUMERIC_3 ++0x80340404 KEY_NUMERIC_4 ++0x80340405 KEY_NUMERIC_5 ++0x80340406 KEY_NUMERIC_6 ++0x80340407 KEY_NUMERIC_7 ++0x80340408 KEY_NUMERIC_8 ++0x80340409 KEY_NUMERIC_9 ++0x80340432 KEY_NUMERIC_POUND ++0x80340433 KEY_NUMERIC_STAR ++0x8034043a KEY_DELETE ++0x80340434 KEY_ENTER ++0x8034045d KEY_PROG1 ++0x8034040d KEY_MUTE ++0x803404cb KEY_INFO ++0x80340410 KEY_VOLUMEUP ++0x80340411 KEY_VOLUMEDOWN ++0x8034041e KEY_CHANNELUP ++0x8034041f KEY_CHANNELDOWN ++0x80340428 KEY_FASTFORWARD ++0x80340429 KEY_REWIND ++0x8034042c KEY_PLAY ++0x80340437 KEY_RECORD ++0x80340430 KEY_PAUSE ++0x80340431 KEY_STOP ++0x80340420 KEY_NEXT ++0x80340421 KEY_PREVIOUS ++0x80340458 KEY_UP ++0x80340459 KEY_DOWN ++0x8034045a KEY_LEFT ++0x8034045b KEY_RIGHT ++0x8034045c KEY_OK ++0x80340483 KEY_EXIT ++0x8034043e KEY_EPG ++0x8034042f KEY_TITLE ++0x8034046d KEY_RED ++0x8034046e KEY_GREEN ++0x8034046f KEY_YELLOW ++0x80340470 KEY_BLUE From 556a1c937dd2c952013d15294a6ab74dfa83813a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 29 Sep 2011 17:07:22 +0200 Subject: [PATCH 13/17] projects/Fusion/linux: add ITE and Nuvoton CIR drivers Signed-off-by: Stephan Raue --- projects/Fusion/linux/linux.i386.conf | 4 ++-- projects/Fusion/linux/linux.x86_64.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 1b66b15921..023796069a 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -1654,9 +1654,9 @@ CONFIG_IR_MCE_KBD_DECODER=y CONFIG_IR_ENE=m CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m -# CONFIG_IR_ITE_CIR is not set +CONFIG_IR_ITE_CIR=m CONFIG_IR_FINTEK=m -# CONFIG_IR_NUVOTON is not set +CONFIG_IR_NUVOTON=m CONFIG_IR_REDRAT3=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index 145c47ed49..6f0bad754d 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -1612,9 +1612,9 @@ CONFIG_IR_MCE_KBD_DECODER=y CONFIG_IR_ENE=m CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m -# CONFIG_IR_ITE_CIR is not set +CONFIG_IR_ITE_CIR=m CONFIG_IR_FINTEK=m -# CONFIG_IR_NUVOTON is not set +CONFIG_IR_NUVOTON=m CONFIG_IR_REDRAT3=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m From ff1da260ba21962aedde0c2aa6d9be6d027259d5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 30 Sep 2011 02:23:34 +0200 Subject: [PATCH 14/17] linux: update to linux-3.1-rc8 Signed-off-by: Stephan Raue --- packages/linux/meta | 2 +- ..._crosscompile.patch => linux-3.1-rc8-000_crosscompile.patch} | 0 ...dev_console.patch => linux-3.1-rc8-003-no_dev_console.patch} | 0 ...tch => linux-3.1-rc8-004_lower_undefined_mode_timeout.patch} | 0 ...06_enable_utf8.patch => linux-3.1-rc8-006_enable_utf8.patch} | 0 ..._floppy_die.patch => linux-3.1-rc8-007_die_floppy_die.patch} | 0 ...=> linux-3.1-rc8-009_disable_i8042_check_on_apple_mac.patch} | 0 ...ver.patch => linux-3.1-rc8-050_add_appleir_usb_driver.patch} | 0 ....1.patch => linux-3.1-rc8-052-aureal_remote_quirk-0.1.patch} | 0 ..._remote-0.1.patch => linux-3.1-rc8-053-ati_remote-0.1.patch} | 0 ...nux-3.1-rc8-053_ati-remote_all_keys_and_keychange-0.1.patch} | 0 ...voton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch} | 0 ... => linux-3.1-rc8-058-add_rtl2832u_dvb-usb_driver-0.1.patch} | 0 ...c8-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch} | 0 ...ch => linux-3.1-rc8-060-fix_dib0700_buffer_access-0.1.patch} | 0 ...> linux-3.1-rc8-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch} | 0 ...atch => linux-3.1-rc8-071-silence_i915_agp-module-0.1.patch} | 0 ...ppiness.patch => linux-3.1-rc8-716_mm-zero_swappiness.patch} | 0 18 files changed, 1 insertion(+), 1 deletion(-) rename packages/linux/patches/{linux-3.1-rc7-000_crosscompile.patch => linux-3.1-rc8-000_crosscompile.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-003-no_dev_console.patch => linux-3.1-rc8-003-no_dev_console.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-004_lower_undefined_mode_timeout.patch => linux-3.1-rc8-004_lower_undefined_mode_timeout.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-006_enable_utf8.patch => linux-3.1-rc8-006_enable_utf8.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-007_die_floppy_die.patch => linux-3.1-rc8-007_die_floppy_die.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-009_disable_i8042_check_on_apple_mac.patch => linux-3.1-rc8-009_disable_i8042_check_on_apple_mac.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-050_add_appleir_usb_driver.patch => linux-3.1-rc8-050_add_appleir_usb_driver.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-052-aureal_remote_quirk-0.1.patch => linux-3.1-rc8-052-aureal_remote_quirk-0.1.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-053-ati_remote-0.1.patch => linux-3.1-rc8-053-ati_remote-0.1.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch => linux-3.1-rc8-053_ati-remote_all_keys_and_keychange-0.1.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch => linux-3.1-rc8-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-058-add_rtl2832u_dvb-usb_driver-0.1.patch => linux-3.1-rc8-058-add_rtl2832u_dvb-usb_driver-0.1.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch => linux-3.1-rc8-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-060-fix_dib0700_buffer_access-0.1.patch => linux-3.1-rc8-060-fix_dib0700_buffer_access-0.1.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch => linux-3.1-rc8-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-071-silence_i915_agp-module-0.1.patch => linux-3.1-rc8-071-silence_i915_agp-module-0.1.patch} (100%) rename packages/linux/patches/{linux-3.1-rc7-716_mm-zero_swappiness.patch => linux-3.1-rc8-716_mm-zero_swappiness.patch} (100%) diff --git a/packages/linux/meta b/packages/linux/meta index 6985512c33..ece160003d 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="3.1-rc7" +PKG_VERSION="3.1-rc8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/patches/linux-3.1-rc7-000_crosscompile.patch b/packages/linux/patches/linux-3.1-rc8-000_crosscompile.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-000_crosscompile.patch rename to packages/linux/patches/linux-3.1-rc8-000_crosscompile.patch diff --git a/packages/linux/patches/linux-3.1-rc7-003-no_dev_console.patch b/packages/linux/patches/linux-3.1-rc8-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-003-no_dev_console.patch rename to packages/linux/patches/linux-3.1-rc8-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-3.1-rc7-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-3.1-rc8-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-3.1-rc8-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-3.1-rc7-006_enable_utf8.patch b/packages/linux/patches/linux-3.1-rc8-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-006_enable_utf8.patch rename to packages/linux/patches/linux-3.1-rc8-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-3.1-rc7-007_die_floppy_die.patch b/packages/linux/patches/linux-3.1-rc8-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-007_die_floppy_die.patch rename to packages/linux/patches/linux-3.1-rc8-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-3.1-rc7-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-3.1-rc8-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-3.1-rc8-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-3.1-rc7-050_add_appleir_usb_driver.patch b/packages/linux/patches/linux-3.1-rc8-050_add_appleir_usb_driver.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-050_add_appleir_usb_driver.patch rename to packages/linux/patches/linux-3.1-rc8-050_add_appleir_usb_driver.patch diff --git a/packages/linux/patches/linux-3.1-rc7-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-3.1-rc8-052-aureal_remote_quirk-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-052-aureal_remote_quirk-0.1.patch rename to packages/linux/patches/linux-3.1-rc8-052-aureal_remote_quirk-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc7-053-ati_remote-0.1.patch b/packages/linux/patches/linux-3.1-rc8-053-ati_remote-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-053-ati_remote-0.1.patch rename to packages/linux/patches/linux-3.1-rc8-053-ati_remote-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch b/packages/linux/patches/linux-3.1-rc8-053_ati-remote_all_keys_and_keychange-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch rename to packages/linux/patches/linux-3.1-rc8-053_ati-remote_all_keys_and_keychange-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc7-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch b/packages/linux/patches/linux-3.1-rc8-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch rename to packages/linux/patches/linux-3.1-rc8-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch diff --git a/packages/linux/patches/linux-3.1-rc7-058-add_rtl2832u_dvb-usb_driver-0.1.patch b/packages/linux/patches/linux-3.1-rc8-058-add_rtl2832u_dvb-usb_driver-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-058-add_rtl2832u_dvb-usb_driver-0.1.patch rename to packages/linux/patches/linux-3.1-rc8-058-add_rtl2832u_dvb-usb_driver-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc7-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch b/packages/linux/patches/linux-3.1-rc8-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch rename to packages/linux/patches/linux-3.1-rc8-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc7-060-fix_dib0700_buffer_access-0.1.patch b/packages/linux/patches/linux-3.1-rc8-060-fix_dib0700_buffer_access-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-060-fix_dib0700_buffer_access-0.1.patch rename to packages/linux/patches/linux-3.1-rc8-060-fix_dib0700_buffer_access-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc7-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch b/packages/linux/patches/linux-3.1-rc8-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch rename to packages/linux/patches/linux-3.1-rc8-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc7-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/linux-3.1-rc8-071-silence_i915_agp-module-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-071-silence_i915_agp-module-0.1.patch rename to packages/linux/patches/linux-3.1-rc8-071-silence_i915_agp-module-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc7-716_mm-zero_swappiness.patch b/packages/linux/patches/linux-3.1-rc8-716_mm-zero_swappiness.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc7-716_mm-zero_swappiness.patch rename to packages/linux/patches/linux-3.1-rc8-716_mm-zero_swappiness.patch From 6648fbfdbf4da26435830845a39358fe5223c4f4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 30 Sep 2011 02:24:13 +0200 Subject: [PATCH 15/17] xf86-video-fglrx: update to xf86-video-fglrx-11.9 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-fglrx/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-fglrx/meta b/packages/x11/driver/xf86-video-fglrx/meta index e1b4a2815b..d09d651dcb 100644 --- a/packages/x11/driver/xf86-video-fglrx/meta +++ b/packages/x11/driver/xf86-video-fglrx/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-fglrx" -PKG_VERSION="11.8" +PKG_VERSION="11.9" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" From 6b8fff906c580d6755ac7e6f412bfd83489bad1d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 30 Sep 2011 02:24:48 +0200 Subject: [PATCH 16/17] alsa-utils: set Master,0 volume on card 1 Signed-off-by: Stephan Raue --- packages/audio/alsa-utils/scripts/soundconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/audio/alsa-utils/scripts/soundconfig b/packages/audio/alsa-utils/scripts/soundconfig index 4c3c9fa3f6..4e224e87ff 100755 --- a/packages/audio/alsa-utils/scripts/soundconfig +++ b/packages/audio/alsa-utils/scripts/soundconfig @@ -130,6 +130,9 @@ else # Shuttle XS35GT needs this too mixer 0 Master,0 100% +# and this for various Fusion devices like Zotac ZBOX + mixer 1 Master,0 100% + fi From 021552784c239ebde1e845eab35fe0a4375a1f0d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 30 Sep 2011 02:27:11 +0200 Subject: [PATCH 17/17] libxcb: add upstream patch Signed-off-by: Stephan Raue --- .../patches/libxcb-1.7-wait_for_reply.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 packages/x11/lib/libxcb/patches/libxcb-1.7-wait_for_reply.patch diff --git a/packages/x11/lib/libxcb/patches/libxcb-1.7-wait_for_reply.patch b/packages/x11/lib/libxcb/patches/libxcb-1.7-wait_for_reply.patch new file mode 100644 index 0000000000..6f9f795d73 --- /dev/null +++ b/packages/x11/lib/libxcb/patches/libxcb-1.7-wait_for_reply.patch @@ -0,0 +1,53 @@ +commit 5ceeaaa4294201b3f613c07f9ec610c0e5f673c7 +Author: Uli Schlachter +Date: Thu Aug 25 14:18:16 2011 +0200 + + Fix a dead-lock due to xcb_poll_for_reply + + Imagine two threads: + + Thread#1: for(;;) { xcb_get_input_focus_reply(c, xcb_get_input_focus(c), 0); } + + Thread#2: for(;;) { xcb_poll_for_event(c); } + + Since xcb_poll_for_event() calls _xcb_in_read() directly without synchronizing + with any other readers, this causes two threads to end up calling recv() at the + same time. We now have a race because any of these two threads could get read + the GetInputFocus reply. + + If thread#2 reads this reply, it will be put in the appropriate queue and + thread#1 will still be stuck in recv(), although its reply was already received. + If no other reply or event causes this thread to wake up, the process deadlocks. + + To fix this, we have to make sure that there is only ever one thread reading + from the connection. The obvious solution is to check in poll_for_next_event() + if another thread is already reading (in which case c->in.reading != 0) and not + to read from the wire in this case. + + This solution is actually correct if we assume that the other thread is blocked + in poll() which means there isn't any data which can be read. Since we already + checked that there is no event in the queue this means that + poll_for_next_event() didn't find any event to return. + + There might be a small race here where the other thread already determined that + there is data to read, but it still has to wait for c->iolock. However, this + means that the next poll_for_next_event() will be able to read the event, so + this shouldn't cause any problems. + + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=40372 + + Signed-off-by: Uli Schlachter + Signed-off-by: Peter Harris + +diff -uNr libxcb-1.7/src/xcb_in.c libxcb-1.7-patched/src/xcb_in.c +--- libxcb-1.7/src/xcb_in.c 2010-08-13 13:43:31.000000000 +0200 ++++ libxcb-1.7-patched/src/xcb_in.c 2011-09-09 06:59:26.990634243 +0200 +@@ -548,7 +548,7 @@ + pthread_mutex_lock(&c->iolock); + /* FIXME: follow X meets Z architecture changes. */ + ret = get_event(c); +- if(!ret && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */ ++ if(!ret && c->in.reading == 0 && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */ + ret = get_event(c); + pthread_mutex_unlock(&c->iolock); + }