From aef4bb9b4939cebae37228ec84517d00ddf5e625 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 28 Nov 2010 20:12:37 +0100 Subject: [PATCH 01/15] projects/ION/options: switch to 'size' optimization (for testing) Signed-off-by: Stephan Raue --- projects/ION/options | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/ION/options b/projects/ION/options index ba359d64e9..b403ac033c 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -44,8 +44,8 @@ ;; esac -# Build optimizations (size/speed) - OPTIMIZATIONS="speed" +# Build optimizations (size/normal/speed) + OPTIMIZATIONS="size" # Project CFLAGS PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe" From 63702a0258c6e4011b480507cbdfd8a9e9e47c63 Mon Sep 17 00:00:00 2001 From: Wintemrute Date: Sun, 28 Nov 2010 20:19:49 +0100 Subject: [PATCH 02/15] Removed double entries --- projects/ATV/options | 5 +---- projects/ION/options | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/projects/ATV/options b/projects/ATV/options index 10528b908e..9ed6d86864 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -53,9 +53,6 @@ # Mediacenter to use (xbmc / no) MEDIACENTER="xbmc-dharma" -# build and install Tvheadend TV server (yes / no) - TVHEADEND="no" - # Skins to install (Confluence) SKINS="Confluence" @@ -83,7 +80,7 @@ FAAC_SUPPORT="yes" # build and install Tvheadend TV server (yes / no) - TVHEADEND="yes" + TVHEADEND="no" # additional drivers to install: # bcm_sta: Broadcom STA WLAN Driver diff --git a/projects/ION/options b/projects/ION/options index b403ac033c..32d7b18d01 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -53,9 +53,6 @@ # Mediacenter to use (xbmc / no) MEDIACENTER="xbmc-dharma" -# build and install Tvheadend TV server (yes / no) - TVHEADEND="yes" - # Skins to install (Confluence) SKINS="Confluence" From d2aa535e7588347a303d4a433f10e683c8c485ff Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 28 Nov 2010 20:32:56 +0100 Subject: [PATCH 03/15] projects/ATV/options: reenable tvheadend support Signed-off-by: Stephan Raue --- projects/ATV/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ATV/options b/projects/ATV/options index 9ed6d86864..9acedb7c39 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -80,7 +80,7 @@ FAAC_SUPPORT="yes" # build and install Tvheadend TV server (yes / no) - TVHEADEND="no" + TVHEADEND="yes" # additional drivers to install: # bcm_sta: Broadcom STA WLAN Driver From 89147aec052376d543fe3956e8f0157bbb1e6710 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Nov 2010 09:10:27 +0100 Subject: [PATCH 04/15] bcm_sta: fix patch Signed-off-by: Stephan Raue --- ...cm_sta-5.60.246.6-010_remove_sysioc_sem.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.60.246.6-010_remove_sysioc_sem.patch b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.60.246.6-010_remove_sysioc_sem.patch index fb7021e7a3..bcb7c9ca9f 100644 --- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.60.246.6-010_remove_sysioc_sem.patch +++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.60.246.6-010_remove_sysioc_sem.patch @@ -1,22 +1,22 @@ diff -Naur bcm_sta-5.60.246.6/x86-32/src/wl/sys/wl_iw.h bcm_sta-5.60.246.6.patch/x86-32/src/wl/sys/wl_iw.h ---- bcm_sta-5.60.246.6/x86-32/src/wl/sys/wl_iw.h 2010-11-22 03:01:28.267226695 +0100 -+++ bcm_sta-5.60.246.6.patch/x86-32/src/wl/sys/wl_iw.h 2010-11-22 03:00:28.308506905 +0100 -@@ -62,6 +62,7 @@ +--- bcm_sta-5.60.246.6/x86-32/src/wl/sys/wl_iw.h 2010-10-22 04:18:57.000000000 +0200 ++++ bcm_sta-5.60.246.6.patch/x86-32/src/wl/sys/wl_iw.h 2010-11-29 08:30:58.911543674 +0100 +@@ -62,7 +62,6 @@ struct timer_list *timer; struct net_device *dev; long sysioc_pid; -+ struct semaphore sysioc_sem; +- struct semaphore sysioc_sem; struct completion sysioc_exited; }; diff -Naur bcm_sta-5.60.246.6/x86-64/src/wl/sys/wl_iw.h bcm_sta-5.60.246.6.patch/x86-64/src/wl/sys/wl_iw.h ---- bcm_sta-5.60.246.6/x86-64/src/wl/sys/wl_iw.h 2010-11-22 03:01:49.840485699 +0100 -+++ bcm_sta-5.60.246.6.patch/x86-64/src/wl/sys/wl_iw.h 2010-11-22 03:00:28.322507073 +0100 -@@ -62,6 +62,7 @@ +--- bcm_sta-5.60.246.6/x86-64/src/wl/sys/wl_iw.h 2010-10-22 04:23:55.000000000 +0200 ++++ bcm_sta-5.60.246.6.patch/x86-64/src/wl/sys/wl_iw.h 2010-11-29 08:31:15.542760506 +0100 +@@ -62,7 +62,6 @@ struct timer_list *timer; struct net_device *dev; long sysioc_pid; -+ struct semaphore sysioc_sem; +- struct semaphore sysioc_sem; struct completion sysioc_exited; }; From 31511498db79201f542aa9b5d0a59edfdaf3c0e2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Nov 2010 09:11:18 +0100 Subject: [PATCH 05/15] config/functions: add function to strip kernel modules Signed-off-by: Stephan Raue --- config/functions | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/functions b/config/functions index 949d768384..63c15fcb25 100644 --- a/config/functions +++ b/config/functions @@ -151,3 +151,8 @@ strip_linker_plugin() { # strip out usage from linker plugin LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||"` } + +strip_kmod() { + [ -z $1 ] && echo "usage strip_kmod " && exit 1 + find $1 -type f -name '*.ko' | xargs -r $STRIP -R .comment -R .note -g --strip-unneeded +} From ba2bd991deffb5a51531267ba8f2497d1e057797 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Nov 2010 09:12:16 +0100 Subject: [PATCH 06/15] crystalhd: use kernel module strip function Signed-off-by: Stephan Raue --- packages/multimedia/crystalhd/install | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/multimedia/crystalhd/install b/packages/multimedia/crystalhd/install index cdbc0dde0c..1c1eedb7b4 100755 --- a/packages/multimedia/crystalhd/install +++ b/packages/multimedia/crystalhd/install @@ -16,9 +16,7 @@ mkdir -p $INSTALL/lib/udev/rules.d mkdir -p $INSTALL/lib/modules/$VER/crystalhd cp $PKG_BUILD/driver/linux/crystalhd.ko $INSTALL/lib/modules/$VER/crystalhd -for MOD in `find $INSTALL/lib/modules/$VER/crystalhd -name *.ko`; do - $STRIP --strip-debug $MOD -done +strip_kmod $INSTALL/lib/modules/$VER/crystalhd $ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do From e8ce7f8a2c824080bccc8f304e18cba181991e48 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Nov 2010 09:12:34 +0100 Subject: [PATCH 07/15] linux: use kernel module strip function Signed-off-by: Stephan Raue --- packages/linux/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/linux/install b/packages/linux/install index 60441c9823..9831dae2de 100755 --- a/packages/linux/install +++ b/packages/linux/install @@ -10,8 +10,9 @@ mkdir -p $INSTALL/lib/modules/$VER cp -r $PKG_BUILD/modules/* $INSTALL rm -f $INSTALL/lib/modules/$VER/modules.* -$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null +strip_kmod $INSTALL/lib/modules/$VER/kernel +$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do rm -f $i done From cc3600dd349ad0ef917c7579cb33c836c285844b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Nov 2010 09:12:56 +0100 Subject: [PATCH 08/15] bcm_sta: use kernel module strip function Signed-off-by: Stephan Raue --- packages/linux-drivers/bcm_sta/install | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/linux-drivers/bcm_sta/install b/packages/linux-drivers/bcm_sta/install index 0cd12e1763..c3efe31325 100755 --- a/packages/linux-drivers/bcm_sta/install +++ b/packages/linux-drivers/bcm_sta/install @@ -8,11 +8,9 @@ mkdir -p $INSTALL/lib/modules/$VER/bcm_sta [ $TARGET_ARCH = i386 ] && cp $PKG_BUILD/x86-32/wl.ko $INSTALL/lib/modules/$VER/bcm_sta [ $TARGET_ARCH = x86_64 ] && cp $PKG_BUILD/x86-64/wl.ko $INSTALL/lib/modules/$VER/bcm_sta - for MOD in `find $INSTALL/lib/modules/$VER/bcm_sta -name *.ko`; do - $STRIP --strip-debug $MOD - done +strip_kmod $INSTALL/lib/modules/$VER/bcm_sta - $ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null - for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do - rm -f $i - done +$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null +for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do + rm -f $i +done From a8b50b03d6f7ff25a38383c0fc7cad8ba371f289 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Nov 2010 09:13:11 +0100 Subject: [PATCH 09/15] rtl8192se: use kernel module strip function Signed-off-by: Stephan Raue --- packages/linux-drivers/rtl8192se/install | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/linux-drivers/rtl8192se/install b/packages/linux-drivers/rtl8192se/install index 120460e5e9..0a5eea4486 100755 --- a/packages/linux-drivers/rtl8192se/install +++ b/packages/linux-drivers/rtl8192se/install @@ -10,11 +10,9 @@ mkdir -p $INSTALL/lib/modules/$VER/rtl8192se mkdir -p $INSTALL/lib/firmware/RTL8192SE cp $PKG_BUILD/firmware/RTL8192SE/* $INSTALL/lib/firmware/RTL8192SE - for MOD in `find $INSTALL/lib/modules/$VER/rtl8192se -name *.ko`; do - $STRIP --strip-debug $MOD - done +strip_kmod $INSTALL/lib/modules/$VER/rtl8192se - $ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null - for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do - rm -f $i - done +$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null +for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do + rm -f $i +done From ac5032b629a68df8a57e32cb56d046fdb806a3d9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Nov 2010 09:13:26 +0100 Subject: [PATCH 10/15] xf86-video-nvidia: use kernel module strip function Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-nvidia/install | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/x11/driver/xf86-video-nvidia/install b/packages/x11/driver/xf86-video-nvidia/install index 9271a553a2..bea4d0ee1b 100755 --- a/packages/x11/driver/xf86-video-nvidia/install +++ b/packages/x11/driver/xf86-video-nvidia/install @@ -25,14 +25,12 @@ mkdir -p $INSTALL/usr/lib mkdir -p $INSTALL/lib/modules/$VER/nvidia cp $PKG_BUILD/kernel/nvidia.ko $INSTALL/lib/modules/$VER/nvidia - for MOD in `find $INSTALL/lib/modules/$VER/nvidia -name *.ko`; do - $STRIP --strip-debug $MOD - done +strip_kmod $INSTALL/lib/modules/$VER/nvidia - $ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null - for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do - rm -f $i - done +$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null +for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do + rm -f $i +done mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/nvidia-smi $INSTALL/usr/bin From c1b173665e39d86196050afd4229f2825999f4ae Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Nov 2010 09:14:03 +0100 Subject: [PATCH 11/15] linux-drivers: fix meta file Signed-off-by: Stephan Raue --- packages/linux-drivers/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-drivers/meta b/packages/linux-drivers/meta index 2861e4056d..f659ae8904 100644 --- a/packages/linux-drivers/meta +++ b/packages/linux-drivers/meta @@ -20,7 +20,7 @@ for drivers in "$ADDITIONAL_DRIVERS"; do rtl8192se) PKG_DEPENDS="$PKG_DEPENDS rtl8192se" ;; - broadcom) PKG_DEPENDS="$PKG_DEPENDS bcm_sta" + bcm_sta) PKG_DEPENDS="$PKG_DEPENDS bcm_sta" ;; esac From c20173e027600a29a80b16a0335ba20060ba364a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Nov 2010 09:14:40 +0100 Subject: [PATCH 12/15] Mesa: unset $LDFLAGS Signed-off-by: Stephan Raue --- packages/graphics/Mesa/build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build index 480aa8ebc2..0f2b337cd9 100755 --- a/packages/graphics/Mesa/build +++ b/packages/graphics/Mesa/build @@ -9,9 +9,8 @@ get_graphicdrivers strip_linker_plugin strip_lto # Mesa fails to build with LTO optimization -# dont use strip or ggdb because of use from mklib - LDFLAGS=`echo $LDFLAGS | sed -e "s|-s | |"` - LDFLAGS=`echo $LDFLAGS | sed -e "s|-ggdb | |"` +# TODO: + LDFLAGS="" MESA_CONFIG=" --disable-gallium --disable-gallium-nouveau --disable-gallium-i915 --disable-gallium-i965" MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r600 --disable-gallium-svga --disable-gallium-swrast" From e4157f35b34076d84acf0208bf2f55cbcbdacde5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 30 Nov 2010 00:18:53 +0100 Subject: [PATCH 13/15] tvheadend: rename to hts-tvheadend, update to hts-tvheadend-2.12 Signed-off-by: Stephan Raue --- .../{tvheadend => hts-tvheadend}/build | 0 .../init.d/55_tvheadend | 0 .../{tvheadend => hts-tvheadend}/install | 0 packages/multimedia/hts-tvheadend/meta | 16 ++++++++++++++++ packages/multimedia/tvheadend/meta | 16 ---------------- scripts/image | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) rename packages/multimedia/{tvheadend => hts-tvheadend}/build (100%) rename packages/multimedia/{tvheadend => hts-tvheadend}/init.d/55_tvheadend (100%) rename packages/multimedia/{tvheadend => hts-tvheadend}/install (100%) create mode 100644 packages/multimedia/hts-tvheadend/meta delete mode 100644 packages/multimedia/tvheadend/meta diff --git a/packages/multimedia/tvheadend/build b/packages/multimedia/hts-tvheadend/build similarity index 100% rename from packages/multimedia/tvheadend/build rename to packages/multimedia/hts-tvheadend/build diff --git a/packages/multimedia/tvheadend/init.d/55_tvheadend b/packages/multimedia/hts-tvheadend/init.d/55_tvheadend similarity index 100% rename from packages/multimedia/tvheadend/init.d/55_tvheadend rename to packages/multimedia/hts-tvheadend/init.d/55_tvheadend diff --git a/packages/multimedia/tvheadend/install b/packages/multimedia/hts-tvheadend/install similarity index 100% rename from packages/multimedia/tvheadend/install rename to packages/multimedia/hts-tvheadend/install diff --git a/packages/multimedia/hts-tvheadend/meta b/packages/multimedia/hts-tvheadend/meta new file mode 100644 index 0000000000..d61abaa624 --- /dev/null +++ b/packages/multimedia/hts-tvheadend/meta @@ -0,0 +1,16 @@ +PKG_NAME="hts-tvheadend" +PKG_VERSION="2.12" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html" +PKG_URL="http://www.lonelycoder.com/debian/dists/hts/main/source/${PKG_NAME}_${PKG_VERSION}.tar.gz" +PKG_DEPENDS="avahi" +PKG_BUILD_DEPENDS="toolchain avahi" +PKG_PRIORITY="optional" +PKG_SECTION="multimedia" +PKG_SHORTDESC="hts-tvheadend: a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources." +PKG_LONGDESC="HTS-Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes" +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/multimedia/tvheadend/meta b/packages/multimedia/tvheadend/meta deleted file mode 100644 index bdee0c62da..0000000000 --- a/packages/multimedia/tvheadend/meta +++ /dev/null @@ -1,16 +0,0 @@ -PKG_NAME="tvheadend" -PKG_VERSION="5650" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html" -PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="avahi" -PKG_BUILD_DEPENDS="toolchain avahi" -PKG_PRIORITY="optional" -PKG_SECTION="multimedia" -PKG_SHORTDESC="tvheadend: a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources." -PKG_LONGDESC="Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes" -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/scripts/image b/scripts/image index ac242fb063..e91d522b52 100755 --- a/scripts/image +++ b/scripts/image @@ -69,7 +69,7 @@ mkdir -p $INSTALL # Multimedia support [ ! "$MEDIACENTER" = no ] && $SCRIPTS/install mediacenter - [ "$TVHEADEND" = yes ] && $SCRIPTS/install tvheadend + [ "$TVHEADEND" = yes ] && $SCRIPTS/install hts-tvheadend # Automounter support [ "$UDISKS" = yes ] && $SCRIPTS/install udisks From f9e4c4a151686c0e68f8db6fe1eff905d66a259e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 30 Nov 2010 00:25:47 +0100 Subject: [PATCH 14/15] linux: update to linux-2.6.36.1 Signed-off-by: Stephan Raue --- packages/linux/meta | 2 +- ...crosscompile.patch => linux-2.6.36.1-000_crosscompile.patch} | 0 ...feature.patch => linux-2.6.36.1-002_bash_only_feature.patch} | 0 ...ev_console.patch => linux-2.6.36.1-003-no_dev_console.patch} | 0 ...ch => linux-2.6.36.1-004_lower_undefined_mode_timeout.patch} | 0 ...tamp.patch => linux-2.6.36.1-005_kconfig_no_timestamp.patch} | 0 ...6_enable_utf8.patch => linux-2.6.36.1-006_enable_utf8.patch} | 0 ...floppy_die.patch => linux-2.6.36.1-007_die_floppy_die.patch} | 0 ...> linux-2.6.36.1-008-hda_intel_prealloc_4mb_dmabuffer.patch} | 0 ...> linux-2.6.36.1-009_disable_i8042_check_on_apple_mac.patch} | 0 ...er.patch => linux-2.6.36.1-050_add_appleir_usb_driver.patch} | 0 ...r-0.2.patch => linux-2.6.36.1-051-add_nuvoton_cir-0.2.patch} | 0 ...1.patch => linux-2.6.36.1-052-aureal_remote_quirk-0.1.patch} | 0 ...mware_revert_abb295f3b3db602f91accf58b526b30b48673af1.patch} | 0 14 files changed, 1 insertion(+), 1 deletion(-) rename packages/linux/patches/{linux-2.6.36-000_crosscompile.patch => linux-2.6.36.1-000_crosscompile.patch} (100%) rename packages/linux/patches/{linux-2.6.36-002_bash_only_feature.patch => linux-2.6.36.1-002_bash_only_feature.patch} (100%) rename packages/linux/patches/{linux-2.6.36-003-no_dev_console.patch => linux-2.6.36.1-003-no_dev_console.patch} (100%) rename packages/linux/patches/{linux-2.6.36-004_lower_undefined_mode_timeout.patch => linux-2.6.36.1-004_lower_undefined_mode_timeout.patch} (100%) rename packages/linux/patches/{linux-2.6.36-005_kconfig_no_timestamp.patch => linux-2.6.36.1-005_kconfig_no_timestamp.patch} (100%) rename packages/linux/patches/{linux-2.6.36-006_enable_utf8.patch => linux-2.6.36.1-006_enable_utf8.patch} (100%) rename packages/linux/patches/{linux-2.6.36-007_die_floppy_die.patch => linux-2.6.36.1-007_die_floppy_die.patch} (100%) rename packages/linux/patches/{linux-2.6.36-008-hda_intel_prealloc_4mb_dmabuffer.patch => linux-2.6.36.1-008-hda_intel_prealloc_4mb_dmabuffer.patch} (100%) rename packages/linux/patches/{linux-2.6.36-009_disable_i8042_check_on_apple_mac.patch => linux-2.6.36.1-009_disable_i8042_check_on_apple_mac.patch} (100%) rename packages/linux/patches/{linux-2.6.36-050_add_appleir_usb_driver.patch => linux-2.6.36.1-050_add_appleir_usb_driver.patch} (100%) rename packages/linux/patches/{linux-2.6.36-051-add_nuvoton_cir-0.2.patch => linux-2.6.36.1-051-add_nuvoton_cir-0.2.patch} (100%) rename packages/linux/patches/{linux-2.6.36-052-aureal_remote_quirk-0.1.patch => linux-2.6.36.1-052-aureal_remote_quirk-0.1.patch} (100%) rename packages/linux/patches/{linux-2.6.36-201-drm_vmware_revert_abb295f3b3db602f91accf58b526b30b48673af1.patch => linux-2.6.36.1-201-drm_vmware_revert_abb295f3b3db602f91accf58b526b30b48673af1.patch} (100%) diff --git a/packages/linux/meta b/packages/linux/meta index ad8974af04..b7dd26647d 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -1,5 +1,5 @@ PKG_NAME="linux" -PKG_VERSION="2.6.36" +PKG_VERSION="2.6.36.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/patches/linux-2.6.36-000_crosscompile.patch b/packages/linux/patches/linux-2.6.36.1-000_crosscompile.patch similarity index 100% rename from packages/linux/patches/linux-2.6.36-000_crosscompile.patch rename to packages/linux/patches/linux-2.6.36.1-000_crosscompile.patch diff --git a/packages/linux/patches/linux-2.6.36-002_bash_only_feature.patch b/packages/linux/patches/linux-2.6.36.1-002_bash_only_feature.patch similarity index 100% rename from packages/linux/patches/linux-2.6.36-002_bash_only_feature.patch rename to packages/linux/patches/linux-2.6.36.1-002_bash_only_feature.patch diff --git a/packages/linux/patches/linux-2.6.36-003-no_dev_console.patch b/packages/linux/patches/linux-2.6.36.1-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-2.6.36-003-no_dev_console.patch rename to packages/linux/patches/linux-2.6.36.1-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-2.6.36-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-2.6.36.1-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-2.6.36-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-2.6.36.1-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-2.6.36-005_kconfig_no_timestamp.patch b/packages/linux/patches/linux-2.6.36.1-005_kconfig_no_timestamp.patch similarity index 100% rename from packages/linux/patches/linux-2.6.36-005_kconfig_no_timestamp.patch rename to packages/linux/patches/linux-2.6.36.1-005_kconfig_no_timestamp.patch diff --git a/packages/linux/patches/linux-2.6.36-006_enable_utf8.patch b/packages/linux/patches/linux-2.6.36.1-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-2.6.36-006_enable_utf8.patch rename to packages/linux/patches/linux-2.6.36.1-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-2.6.36-007_die_floppy_die.patch b/packages/linux/patches/linux-2.6.36.1-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-2.6.36-007_die_floppy_die.patch rename to packages/linux/patches/linux-2.6.36.1-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-2.6.36-008-hda_intel_prealloc_4mb_dmabuffer.patch b/packages/linux/patches/linux-2.6.36.1-008-hda_intel_prealloc_4mb_dmabuffer.patch similarity index 100% rename from packages/linux/patches/linux-2.6.36-008-hda_intel_prealloc_4mb_dmabuffer.patch rename to packages/linux/patches/linux-2.6.36.1-008-hda_intel_prealloc_4mb_dmabuffer.patch diff --git a/packages/linux/patches/linux-2.6.36-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-2.6.36.1-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-2.6.36-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-2.6.36.1-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-2.6.36-050_add_appleir_usb_driver.patch b/packages/linux/patches/linux-2.6.36.1-050_add_appleir_usb_driver.patch similarity index 100% rename from packages/linux/patches/linux-2.6.36-050_add_appleir_usb_driver.patch rename to packages/linux/patches/linux-2.6.36.1-050_add_appleir_usb_driver.patch diff --git a/packages/linux/patches/linux-2.6.36-051-add_nuvoton_cir-0.2.patch b/packages/linux/patches/linux-2.6.36.1-051-add_nuvoton_cir-0.2.patch similarity index 100% rename from packages/linux/patches/linux-2.6.36-051-add_nuvoton_cir-0.2.patch rename to packages/linux/patches/linux-2.6.36.1-051-add_nuvoton_cir-0.2.patch diff --git a/packages/linux/patches/linux-2.6.36-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-2.6.36.1-052-aureal_remote_quirk-0.1.patch similarity index 100% rename from packages/linux/patches/linux-2.6.36-052-aureal_remote_quirk-0.1.patch rename to packages/linux/patches/linux-2.6.36.1-052-aureal_remote_quirk-0.1.patch diff --git a/packages/linux/patches/linux-2.6.36-201-drm_vmware_revert_abb295f3b3db602f91accf58b526b30b48673af1.patch b/packages/linux/patches/linux-2.6.36.1-201-drm_vmware_revert_abb295f3b3db602f91accf58b526b30b48673af1.patch similarity index 100% rename from packages/linux/patches/linux-2.6.36-201-drm_vmware_revert_abb295f3b3db602f91accf58b526b30b48673af1.patch rename to packages/linux/patches/linux-2.6.36.1-201-drm_vmware_revert_abb295f3b3db602f91accf58b526b30b48673af1.patch From c79cf77e2481ef5169f73b971ea51dafeacbd603 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 30 Nov 2010 00:46:31 +0100 Subject: [PATCH 15/15] libva: update to libva-1.0.6 Signed-off-by: Stephan Raue --- packages/multimedia/libva/build | 6 +----- packages/multimedia/libva/install | 6 +++--- packages/multimedia/libva/meta | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/packages/multimedia/libva/build b/packages/multimedia/libva/build index 7db418d329..788e0aacbe 100755 --- a/packages/multimedia/libva/build +++ b/packages/multimedia/libva/build @@ -2,11 +2,7 @@ . config/options $1 -cd $BUILD/$PKG_NAME-* - -# apply patches provide with the source package - cat debian/patches/*.patch | patch -p1 - +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/libva/install b/packages/multimedia/libva/install index cf8eed6b10..27496526a9 100755 --- a/packages/multimedia/libva/install +++ b/packages/multimedia/libva/install @@ -3,13 +3,13 @@ . config/options $1 mkdir -p $INSTALL/usr/lib - cp -P $BUILD/$PKG_NAME-*/va/.libs/libva*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/va/.libs/libva*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libva-*.so*T mkdir -p $INSTALL/usr/lib/va - cp -P $BUILD/$PKG_NAME-*/i965_drv_video/.libs/*.so $INSTALL/usr/lib/va + cp -P $PKG_BUILD/i965_drv_video/.libs/*.so $INSTALL/usr/lib/va if [ "$DEVTOOLS" = yes ]; then mkdir -p $INSTALL/usr/bin - cp $BUILD/$PKG_NAME-*/test/.libs/vainfo $INSTALL/usr/bin + cp $PKG_BUILD/test/.libs/vainfo $INSTALL/usr/bin fi diff --git a/packages/multimedia/libva/meta b/packages/multimedia/libva/meta index d97f46387b..690ce0802f 100644 --- a/packages/multimedia/libva/meta +++ b/packages/multimedia/libva/meta @@ -1,10 +1,10 @@ PKG_NAME="libva" -PKG_VERSION="0.31.1-1+sds4" +PKG_VERSION="1.0.6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://freedesktop.org/wiki/Software/vaapi" -PKG_URL="http://www.splitted-desktop.com/~gbeauchesne/libva/${PKG_NAME}_${PKG_VERSION}.tar.gz" +PKG_URL="http://cgit.freedesktop.org/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="libX11 libXext libXfixes libdrm Mesa" PKG_BUILD_DEPENDS="toolchain libX11 libXext libXfixes libdrm Mesa" PKG_PRIORITY="optional"