From be1a9d15114cdf4c850517d497e6686a00e75918 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 14 Aug 2013 08:53:54 +0400 Subject: [PATCH 01/14] xorg changes for appletv change debug comment and remove HDMI preference for 1920x1080 resolution --- projects/ATV/filesystem/etc/X11/xorg-nvidia.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf b/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf index bea34e6e92..bbbd0a1df8 100644 --- a/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf +++ b/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf @@ -8,8 +8,6 @@ Section "Device" Option "ModeValidation" "NoVesaModes, NoXServerModes" Option "HWCursor" "false" Option "RegistryDwords" "RMDisableRenderToSysmem=1" - # To put Xorg in debug mode change "false" to "true" in the line below: - Option "ModeDebug" "false" # To use a local /storage/.config/edid.bin file uncomment the 4 lines below: # Option "ConnectedMonitor" "DFP-0" # Option "CustomEDID" "DFP-0:/storage/.config/edid.bin" @@ -17,6 +15,9 @@ Section "Device" # Option "UseEDID" "true" EndSection +# To put Xorg in debug mode "touch /storage/.config/debug.xorg" .. if you set +# "ModeDebug" "true" in xorg.conf IT WILL NOT WORK! + Section "Screen" Identifier "screen" Device "nvidia" @@ -26,7 +27,7 @@ Section "Screen" Option "TVStandard" "HD1080i" # If Component video does not fill the screen uncomment the line below: # Option "TVOverscan" "0.8" # use values from 0.0 (min) to 1.0 (max) - Option "MetaModes" "DFP: 1920x1080; DFP: nvidia-auto-select; TV: 1280x720; TV: nvidia-auto-select" + Option "MetaModes" "DFP: nvidia-auto-select; TV: 1280x720; TV: nvidia-auto-select" SubSection "Display" Depth 24 EndSubSection From a713897a8f6283a7edd4423e96cdc4fdb78708cb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 14 Aug 2013 11:46:24 +0200 Subject: [PATCH 02/14] Revert "linux:update to linux-3.10.6" This reverts commit 78e1a8a3938a0e3379deb35186b0485ec31d9587. --- packages/linux/meta | 2 +- .../patches/{3.10.6 => 3.10.5}/linux-003-no_dev_console.patch | 0 .../{3.10.6 => 3.10.5}/linux-010-perf_crosscompiling.patch | 0 .../{3.10.6 => 3.10.5}/linux-052-XBOX_remote_support.patch | 0 .../{3.10.6 => 3.10.5}/linux-053-spinelplus-remote-0.2.patch | 0 ...ton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch | 0 .../linux-055-add_Formosa_eHome_Infrared_Receiver.patch | 0 .../linux-056-add_Adaptec_eHome_Infrared_Receiver.patch | 0 ...57-Removed-MCE-customer-code-restriction-in-rc6-decode.patch | 0 .../linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch | 0 .../linux-058.01-HID-Sony-upstream_patches.patch | 0 .../linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch | 0 .../{3.10.6 => 3.10.5}/linux-058.06-hid_sony-add_SMK_link.patch | 0 .../linux-059-remove_some_xpad_pids-0.2.patch | 0 .../{3.10.6 => 3.10.5}/linux-060-add_AUGUST_DVB-T205.patch | 0 .../linux-203-stb0899_enable_low_symbol_rate.patch | 0 .../linux/patches/{3.10.6 => 3.10.5}/linux-210-dvbsky.patch | 0 .../linux-212-mantis_stb0899_faster_lock.patch | 0 .../patches/{3.10.6 => 3.10.5}/linux-221-ngene-octopus.patch | 0 .../{3.10.6 => 3.10.5}/linux-222-stb0899_signal_quality.patch | 0 .../linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch | 0 .../patches/{3.10.6 => 3.10.5}/linux-700-jmicron_1_0_8_5.patch | 0 .../{3.10.6 => 3.10.5}/linux-701-linksys_aes2500_brcmfmac.patch | 0 .../linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch | 0 .../{3.10.6 => 3.10.5}/linux-703-macmini2012-ethernet.patch | 0 .../patches/{3.10.6 => 3.10.5}/linux-900-hide_tsc_error.patch | 0 .../linux-950-saa716x_PCIe_interface_chipset.patch | 0 ...990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch | 0 .../{3.10.6 => 3.10.5}/linux-995-CX24120-13Z_frontend.patch | 0 .../linux-997-disable-rc6-on-sandybridge-gt1.patch | 0 ...pufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch | 0 31 files changed, 1 insertion(+), 1 deletion(-) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-003-no_dev_console.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-010-perf_crosscompiling.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-052-XBOX_remote_support.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-053-spinelplus-remote-0.2.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-055-add_Formosa_eHome_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-058.01-HID-Sony-upstream_patches.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-058.06-hid_sony-add_SMK_link.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-059-remove_some_xpad_pids-0.2.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-060-add_AUGUST_DVB-T205.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-203-stb0899_enable_low_symbol_rate.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-210-dvbsky.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-212-mantis_stb0899_faster_lock.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-221-ngene-octopus.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-222-stb0899_signal_quality.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-700-jmicron_1_0_8_5.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-701-linksys_aes2500_brcmfmac.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-703-macmini2012-ethernet.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-900-hide_tsc_error.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-950-saa716x_PCIe_interface_chipset.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-995-CX24120-13Z_frontend.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-997-disable-rc6-on-sandybridge-gt1.patch (100%) rename packages/linux/patches/{3.10.6 => 3.10.5}/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch (100%) diff --git a/packages/linux/meta b/packages/linux/meta index d4dd7ff4c9..dbba7cc3d7 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -34,7 +34,7 @@ case "$LINUX" in PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" ;; *) - PKG_VERSION="3.10.6" + PKG_VERSION="3.10.5" PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" ;; esac diff --git a/packages/linux/patches/3.10.6/linux-003-no_dev_console.patch b/packages/linux/patches/3.10.5/linux-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-003-no_dev_console.patch rename to packages/linux/patches/3.10.5/linux-003-no_dev_console.patch diff --git a/packages/linux/patches/3.10.6/linux-010-perf_crosscompiling.patch b/packages/linux/patches/3.10.5/linux-010-perf_crosscompiling.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-010-perf_crosscompiling.patch rename to packages/linux/patches/3.10.5/linux-010-perf_crosscompiling.patch diff --git a/packages/linux/patches/3.10.6/linux-052-XBOX_remote_support.patch b/packages/linux/patches/3.10.5/linux-052-XBOX_remote_support.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-052-XBOX_remote_support.patch rename to packages/linux/patches/3.10.5/linux-052-XBOX_remote_support.patch diff --git a/packages/linux/patches/3.10.6/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/3.10.5/linux-053-spinelplus-remote-0.2.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-053-spinelplus-remote-0.2.patch rename to packages/linux/patches/3.10.5/linux-053-spinelplus-remote-0.2.patch diff --git a/packages/linux/patches/3.10.6/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch b/packages/linux/patches/3.10.5/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch rename to packages/linux/patches/3.10.5/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch diff --git a/packages/linux/patches/3.10.6/linux-055-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.10.5/linux-055-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-055-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.10.5/linux-055-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.10.6/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.10.5/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.10.5/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.10.6/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/3.10.5/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch rename to packages/linux/patches/3.10.5/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch diff --git a/packages/linux/patches/3.10.6/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/packages/linux/patches/3.10.5/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch rename to packages/linux/patches/3.10.5/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.10.6/linux-058.01-HID-Sony-upstream_patches.patch b/packages/linux/patches/3.10.5/linux-058.01-HID-Sony-upstream_patches.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-058.01-HID-Sony-upstream_patches.patch rename to packages/linux/patches/3.10.5/linux-058.01-HID-Sony-upstream_patches.patch diff --git a/packages/linux/patches/3.10.6/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch b/packages/linux/patches/3.10.5/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch rename to packages/linux/patches/3.10.5/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch diff --git a/packages/linux/patches/3.10.6/linux-058.06-hid_sony-add_SMK_link.patch b/packages/linux/patches/3.10.5/linux-058.06-hid_sony-add_SMK_link.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-058.06-hid_sony-add_SMK_link.patch rename to packages/linux/patches/3.10.5/linux-058.06-hid_sony-add_SMK_link.patch diff --git a/packages/linux/patches/3.10.6/linux-059-remove_some_xpad_pids-0.2.patch b/packages/linux/patches/3.10.5/linux-059-remove_some_xpad_pids-0.2.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-059-remove_some_xpad_pids-0.2.patch rename to packages/linux/patches/3.10.5/linux-059-remove_some_xpad_pids-0.2.patch diff --git a/packages/linux/patches/3.10.6/linux-060-add_AUGUST_DVB-T205.patch b/packages/linux/patches/3.10.5/linux-060-add_AUGUST_DVB-T205.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-060-add_AUGUST_DVB-T205.patch rename to packages/linux/patches/3.10.5/linux-060-add_AUGUST_DVB-T205.patch diff --git a/packages/linux/patches/3.10.6/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.10.5/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/3.10.5/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/3.10.6/linux-210-dvbsky.patch b/packages/linux/patches/3.10.5/linux-210-dvbsky.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-210-dvbsky.patch rename to packages/linux/patches/3.10.5/linux-210-dvbsky.patch diff --git a/packages/linux/patches/3.10.6/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.10.5/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/3.10.5/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/3.10.6/linux-221-ngene-octopus.patch b/packages/linux/patches/3.10.5/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-221-ngene-octopus.patch rename to packages/linux/patches/3.10.5/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/3.10.6/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/3.10.5/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/3.10.5/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/3.10.6/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/packages/linux/patches/3.10.5/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch rename to packages/linux/patches/3.10.5/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch diff --git a/packages/linux/patches/3.10.6/linux-700-jmicron_1_0_8_5.patch b/packages/linux/patches/3.10.5/linux-700-jmicron_1_0_8_5.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-700-jmicron_1_0_8_5.patch rename to packages/linux/patches/3.10.5/linux-700-jmicron_1_0_8_5.patch diff --git a/packages/linux/patches/3.10.6/linux-701-linksys_aes2500_brcmfmac.patch b/packages/linux/patches/3.10.5/linux-701-linksys_aes2500_brcmfmac.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-701-linksys_aes2500_brcmfmac.patch rename to packages/linux/patches/3.10.5/linux-701-linksys_aes2500_brcmfmac.patch diff --git a/packages/linux/patches/3.10.6/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch b/packages/linux/patches/3.10.5/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch rename to packages/linux/patches/3.10.5/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch diff --git a/packages/linux/patches/3.10.6/linux-703-macmini2012-ethernet.patch b/packages/linux/patches/3.10.5/linux-703-macmini2012-ethernet.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-703-macmini2012-ethernet.patch rename to packages/linux/patches/3.10.5/linux-703-macmini2012-ethernet.patch diff --git a/packages/linux/patches/3.10.6/linux-900-hide_tsc_error.patch b/packages/linux/patches/3.10.5/linux-900-hide_tsc_error.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-900-hide_tsc_error.patch rename to packages/linux/patches/3.10.5/linux-900-hide_tsc_error.patch diff --git a/packages/linux/patches/3.10.6/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/3.10.5/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/3.10.5/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/3.10.6/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/3.10.5/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch rename to packages/linux/patches/3.10.5/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch diff --git a/packages/linux/patches/3.10.6/linux-995-CX24120-13Z_frontend.patch b/packages/linux/patches/3.10.5/linux-995-CX24120-13Z_frontend.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-995-CX24120-13Z_frontend.patch rename to packages/linux/patches/3.10.5/linux-995-CX24120-13Z_frontend.patch diff --git a/packages/linux/patches/3.10.6/linux-997-disable-rc6-on-sandybridge-gt1.patch b/packages/linux/patches/3.10.5/linux-997-disable-rc6-on-sandybridge-gt1.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-997-disable-rc6-on-sandybridge-gt1.patch rename to packages/linux/patches/3.10.5/linux-997-disable-rc6-on-sandybridge-gt1.patch diff --git a/packages/linux/patches/3.10.6/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch b/packages/linux/patches/3.10.5/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch similarity index 100% rename from packages/linux/patches/3.10.6/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch rename to packages/linux/patches/3.10.5/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch From 9b4e37649dc308b7054ec33e1cb95961445bc8b9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 14 Aug 2013 11:13:35 +0200 Subject: [PATCH 03/14] ratpoison: update to ratpoison-1.4.6 Signed-off-by: Stephan Raue --- packages/x11/other/ratpoison/package.mk | 4 +-- .../ratpoison-1.4.5-automake_1.13.patch | 12 ------- .../patches/ratpoison-1.4.5-getline.patch | 12 ------- .../ratpoison-1.4.5-staticgravity.patch | 35 ------------------- 4 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 packages/x11/other/ratpoison/patches/ratpoison-1.4.5-automake_1.13.patch delete mode 100644 packages/x11/other/ratpoison/patches/ratpoison-1.4.5-getline.patch delete mode 100644 packages/x11/other/ratpoison/patches/ratpoison-1.4.5-staticgravity.patch diff --git a/packages/x11/other/ratpoison/package.mk b/packages/x11/other/ratpoison/package.mk index 8f7fbdf06c..62301d5a91 100644 --- a/packages/x11/other/ratpoison/package.mk +++ b/packages/x11/other/ratpoison/package.mk @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="ratpoison" -PKG_VERSION="1.4.5" +PKG_VERSION="1.4.6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.nongnu.org/ratpoison" -PKG_URL="http://mirror.lihnidos.org/GNU/savannah/ratpoison/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://download.savannah.nongnu.org/releases/ratpoison/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="libXft libX11 libXext libXtst libXinerama liberation-fonts-ttf" PKG_BUILD_DEPENDS_TARGET="toolchain util-macros libXft libICE libX11 libXext libXtst libXinerama" PKG_PRIORITY="optional" diff --git a/packages/x11/other/ratpoison/patches/ratpoison-1.4.5-automake_1.13.patch b/packages/x11/other/ratpoison/patches/ratpoison-1.4.5-automake_1.13.patch deleted file mode 100644 index 2b59f458bd..0000000000 --- a/packages/x11/other/ratpoison/patches/ratpoison-1.4.5-automake_1.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ratpoison-1.4.5-old/configure.in ratpoison-1.4.5-new/configure.in ---- ratpoison-1.4.5-old/configure.in 2009-07-12 14:01:04.000000000 -0700 -+++ ratpoison-1.4.5-new/configure.in 2013-01-03 19:26:12.000000000 -0800 -@@ -24,7 +24,7 @@ - - AM_MAINTAINER_MODE - --AM_CONFIG_HEADER(src/config.h) -+AC_CONFIG_HEADERS(src/config.h) - - dnl by default turn off debugging - AC_MSG_CHECKING(whether to enable debugging) diff --git a/packages/x11/other/ratpoison/patches/ratpoison-1.4.5-getline.patch b/packages/x11/other/ratpoison/patches/ratpoison-1.4.5-getline.patch deleted file mode 100644 index 95fcab638d..0000000000 --- a/packages/x11/other/ratpoison/patches/ratpoison-1.4.5-getline.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ratpoison-1.4.5-old/configure.in ratpoison-1.4.5-new/configure.in ---- ratpoison-1.4.5-old/configure.in 2009-07-12 14:01:04.000000000 -0700 -+++ ratpoison-1.4.5-new/configure.in 2009-07-14 19:56:24.000000000 -0700 -@@ -146,7 +146,7 @@ - dnl Checks for typedefs, structures, and compiler characteristics. - - dnl Checks for library functions. --AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep) -+AC_CHECK_FUNCS(getline getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep) - - AC_TYPE_SIGNAL - diff --git a/packages/x11/other/ratpoison/patches/ratpoison-1.4.5-staticgravity.patch b/packages/x11/other/ratpoison/patches/ratpoison-1.4.5-staticgravity.patch deleted file mode 100644 index 642fe0e262..0000000000 --- a/packages/x11/other/ratpoison/patches/ratpoison-1.4.5-staticgravity.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur ratpoison-1.4.5-old/src/actions.c ratpoison-1.4.5-new/src/actions.c ---- ratpoison-1.4.5-old/src/actions.c 2009-07-14 19:56:16.000000000 -0700 -+++ ratpoison-1.4.5-new/src/actions.c 2009-07-14 19:56:56.000000000 -0700 -@@ -1882,6 +1882,8 @@ - { - int ret = -1; - -+ if (!strcasecmp (data, "static") || !strcasecmp (data, "static") || !strcmp (data, "10")) -+ ret = StaticGravity; - if (!strcasecmp (data, "northwest") || !strcasecmp (data, "nw") || !strcmp (data, "7")) - ret = NorthWestGravity; - if (!strcasecmp (data, "north") || !strcasecmp (data, "n") || !strcmp (data, "8")) -diff -Naur ratpoison-1.4.5-old/src/manage.c ratpoison-1.4.5-new/src/manage.c ---- ratpoison-1.4.5-old/src/manage.c 2009-07-14 19:56:16.000000000 -0700 -+++ ratpoison-1.4.5-new/src/manage.c 2009-07-14 19:56:56.000000000 -0700 -@@ -541,6 +541,9 @@ - case SouthEastGravity: - win->x = frame->x + frame->width - win->width - win->border; - break; -+ case StaticGravity: -+ win->x = frame->x + win->x; -+ break; - } - - /* Y coord. */ -@@ -561,6 +564,9 @@ - case SouthWestGravity: - win->y = frame->y + frame->height - win->height - win->border; - break; -+ case StaticGravity: -+ win->y = frame->y + win->y; -+ break; - } - } - From 7371d2a48f422eb0bb0bbb8779e290549ffafe92 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 14 Aug 2013 11:45:20 +0200 Subject: [PATCH 04/14] xbmc: update to xbmc-12.2-41ba7b9 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/package.mk | 2 +- .../todo/xbmc-990.27-PR2232.patch.bk | 0 ...-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk | 0 .../xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk | 0 .../xbmc-321-texturepacker-hostflags-and-rework.patch | 0 ...bmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch | 0 .../xbmc-452-change_lcd_content-0.1.patch | 0 .../xbmc-453-add_openelec.tv_RSS_news-0.1.patch | 0 .../xbmc-990.00-remove-windowed-display-mode.patch | 0 .../xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch | 0 .../xbmc-995.11-enable-vpp-deinterlacing.patch | 0 .../xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch | 0 .../xbmc-995.13-vpp-fix-skipping.patch | 0 14 files changed, 2 insertions(+), 2 deletions(-) rename packages/mediacenter/xbmc/patches/{12.2-a603ef9 => 12.2-41ba7b9}/todo/xbmc-990.27-PR2232.patch.bk (100%) rename packages/mediacenter/xbmc/patches/{12.2-a603ef9 => 12.2-41ba7b9}/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk (100%) rename packages/mediacenter/xbmc/patches/{12.2-a603ef9 => 12.2-41ba7b9}/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk (100%) rename packages/mediacenter/xbmc/patches/{12.2-a603ef9 => 12.2-41ba7b9}/xbmc-321-texturepacker-hostflags-and-rework.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-a603ef9 => 12.2-41ba7b9}/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-a603ef9 => 12.2-41ba7b9}/xbmc-452-change_lcd_content-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-a603ef9 => 12.2-41ba7b9}/xbmc-453-add_openelec.tv_RSS_news-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-a603ef9 => 12.2-41ba7b9}/xbmc-990.00-remove-windowed-display-mode.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-a603ef9 => 12.2-41ba7b9}/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-a603ef9 => 12.2-41ba7b9}/xbmc-995.11-enable-vpp-deinterlacing.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-a603ef9 => 12.2-41ba7b9}/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-a603ef9 => 12.2-41ba7b9}/xbmc-995.13-vpp-fix-skipping.patch (100%) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 80c99240e0..72270dac53 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="12.2-a603ef9" +PKG_VERSION="12.2-41ba7b9" if [ "$XBMC" = "master" ]; then PKG_VERSION="13.alpha-df91888" elif [ "$XBMC" = "xbmc-aml" ]; then diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index ddd8b02492..54f1d3f755 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.2-a603ef9" +PKG_VERSION="12.2-41ba7b9" if [ "$XBMC" = "master" ]; then PKG_VERSION="13.alpha-df91888" elif [ "$XBMC" = "xbmc-aml" ]; then diff --git a/packages/mediacenter/xbmc/patches/12.2-a603ef9/todo/xbmc-990.27-PR2232.patch.bk b/packages/mediacenter/xbmc/patches/12.2-41ba7b9/todo/xbmc-990.27-PR2232.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-a603ef9/todo/xbmc-990.27-PR2232.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-41ba7b9/todo/xbmc-990.27-PR2232.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-a603ef9/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk b/packages/mediacenter/xbmc/patches/12.2-41ba7b9/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-a603ef9/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-41ba7b9/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-a603ef9/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk b/packages/mediacenter/xbmc/patches/12.2-41ba7b9/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-a603ef9/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-41ba7b9/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-990.00-remove-windowed-display-mode.patch b/packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-990.00-remove-windowed-display-mode.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-990.00-remove-windowed-display-mode.patch rename to packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-990.00-remove-windowed-display-mode.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch b/packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch rename to packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-995.11-enable-vpp-deinterlacing.patch b/packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-995.11-enable-vpp-deinterlacing.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-995.11-enable-vpp-deinterlacing.patch rename to packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-995.11-enable-vpp-deinterlacing.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch b/packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch rename to packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-995.13-vpp-fix-skipping.patch b/packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-995.13-vpp-fix-skipping.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-995.13-vpp-fix-skipping.patch rename to packages/mediacenter/xbmc/patches/12.2-41ba7b9/xbmc-995.13-vpp-fix-skipping.patch From 1e04aecd0a075accaffabcdc6a6c84fd52c63f9f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 15 Aug 2013 13:49:06 +0200 Subject: [PATCH 05/14] dbus: disable verbose mode and asserts support Signed-off-by: Stephan Raue --- packages/sysutils/dbus/package.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/sysutils/dbus/package.mk b/packages/sysutils/dbus/package.mk index b877a41fae..45455c4bed 100644 --- a/packages/sysutils/dbus/package.mk +++ b/packages/sysutils/dbus/package.mk @@ -38,8 +38,8 @@ PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \ --libexecdir=/usr/lib/dbus \ - --enable-verbose-mode \ - --enable-asserts \ + --disable-verbose-mode \ + --disable-asserts \ --enable-checks \ --disable-tests \ --disable-ansi \ @@ -56,9 +56,9 @@ PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \ --without-x \ --with-dbus-user=dbus" -PKG_CONFIGURE_OPTS_HOST="--enable-verbose-mode \ - --enable-asserts \ - --enable-checks \ +PKG_CONFIGURE_OPTS_HOST="--disable-verbose-mode \ + --disable-asserts \ + --disable-checks \ --disable-tests \ --disable-xml-docs \ --disable-doxygen-docs" From 1442620d0b2a6400dd93f03cab1792d2d8af5861 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 15 Aug 2013 13:49:56 +0200 Subject: [PATCH 06/14] bcm2835-driver: dont load vllinit init script, cleanup Signed-off-by: Stephan Raue --- .../graphics/bcm2835-driver/init.d/81_vllinit | 28 ------------------- .../bcm2835-driver/profile.d/display.conf | 4 +-- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 packages/graphics/bcm2835-driver/init.d/81_vllinit diff --git a/packages/graphics/bcm2835-driver/init.d/81_vllinit b/packages/graphics/bcm2835-driver/init.d/81_vllinit deleted file mode 100644 index 9214da8a0c..0000000000 --- a/packages/graphics/bcm2835-driver/init.d/81_vllinit +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ -# -# set vll dir and run vcfiled service -# -# runlevels: openelec - -progress "run vcfiled service" - - /usr/sbin/vcfiled - diff --git a/packages/graphics/bcm2835-driver/profile.d/display.conf b/packages/graphics/bcm2835-driver/profile.d/display.conf index 76c8265d67..56487e4d8f 100644 --- a/packages/graphics/bcm2835-driver/profile.d/display.conf +++ b/packages/graphics/bcm2835-driver/profile.d/display.conf @@ -27,6 +27,6 @@ # stub function wait_for_xorg () { - echo 0 > /sys/class/vtconsole/vtcon1/bind - fbset -g 1 1 1 1 32 + echo 0 > /sys/class/vtconsole/vtcon1/bind + # fbset -g 1 1 1 1 32 } From 397c9bba748bd296561c32508c1afdbfa8543776 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 15 Aug 2013 13:51:25 +0200 Subject: [PATCH 07/14] ffmpeg: depends on libXVBA if enabled Signed-off-by: Stephan Raue --- packages/multimedia/ffmpeg/meta | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/multimedia/ffmpeg/meta b/packages/multimedia/ffmpeg/meta index 3d0fb8a4c7..278af23b64 100644 --- a/packages/multimedia/ffmpeg/meta +++ b/packages/multimedia/ffmpeg/meta @@ -47,3 +47,19 @@ if [ "$VDPAU" = yes ]; then PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau" PKG_DEPENDS="$PKG_DEPENDS libvdpau" fi + +if [ "$XVBA" = yes ]; then + get_graphicdrivers + for drv in $GRAPHIC_DRIVERS; do + if [ "$drv" = "fglrx" ]; then + PKG_DEPENDS="$PKG_DEPENDS xf86-video-fglrx" + PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET xf86-video-fglrx" + elif [ "$drv" = "fglrx-legacy" ]; then + PKG_DEPENDS="$PKG_DEPENDS xf86-video-fglrx-legacy" + PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET xf86-video-fglrx-legacy" + fi + done + XBMC_XVBA="--enable-xvba" +else + XBMC_XVBA="--disable-xvba" +fi From f32649eafba9dab4e95e42bd9898ccb71a814e87 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 15 Aug 2013 13:52:20 +0200 Subject: [PATCH 08/14] new package: add package 'libXVBA', seperated from xf86-video-fglrx and updated to libXVBA-13.8 Signed-off-by: Stephan Raue --- packages/multimedia/libXVBA/package.mk | 75 ++++++++++++++++++++++ packages/x11/driver/xf86-video-fglrx/build | 25 ++++---- packages/x11/driver/xf86-video-fglrx/meta | 6 ++ 3 files changed, 94 insertions(+), 12 deletions(-) create mode 100644 packages/multimedia/libXVBA/package.mk diff --git a/packages/multimedia/libXVBA/package.mk b/packages/multimedia/libXVBA/package.mk new file mode 100644 index 0000000000..793aaf4833 --- /dev/null +++ b/packages/multimedia/libXVBA/package.mk @@ -0,0 +1,75 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="libXVBA" +PKG_VERSION="13.8" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://amd.com" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS="libX11" +PKG_BUILD_DEPENDS="toolchain libX11 dri2proto libXext" +PKG_PRIORITY="optional" +PKG_SECTION="multimedia" +PKG_SHORTDESC="libXVBA: a Video Decode library for AMD" +PKG_LONGDESC="libXVBA is a Video Decode library for AMD." + +PKG_IS_ADDON="no" +PKG_AUTORECONF="no" + +if [ "$TARGET_ARCH" = i386 ]; then + LIBXVBA_FGLRX_ARCH=x86 + LIBXVBA_LIBDIR=lib +elif [ "$TARGET_ARCH" = x86_64 ]; then + LIBXVBA_FGLRX_ARCH=x86_64 + LIBXVBA_LIBDIR=lib64 +fi + +LIBXVBA_INSTALL_DIR="/usr/lib/fglrx/" + +make_target() { + : # nothing to make +} + +makeinstall_target() { + mkdir -p $SYSROOT_PREFIX/usr/include/amd + cp include/amdxvba.h $SYSROOT_PREFIX/usr/include/amd + + mkdir -p $SYSROOT_PREFIX/usr/lib + cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib + ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1 + ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so +} + +post_makeinstall_target() { + mkdir -p $INSTALL/$LIBXVBA_INSTALL_DIR/lib + cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/$LIBXVBA_LIBDIR/libAMDXvBA.cap $INSTALL/$LIBXVBA_INSTALL_DIR/lib + cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/$LIBXVBA_LIBDIR/libAMDXvBA.so* $INSTALL/$LIBXVBA_INSTALL_DIR/lib/libAMDXvBA.so.1 + cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/$LIBXVBA_LIBDIR/libXvBAW.so* $INSTALL/$LIBXVBA_INSTALL_DIR/lib/libXvBAW.so.1 + + ( + cd $INSTALL/$LIBXVBA_INSTALL_DIR/ + for lib in `find lib -type f`; do + mkdir -p $INSTALL/usr/`dirname $lib` + ln -sf /var/run/fglrx/$lib $INSTALL/usr/$lib + done + ) +} diff --git a/packages/x11/driver/xf86-video-fglrx/build b/packages/x11/driver/xf86-video-fglrx/build index 2581cf0abf..27cee58478 100755 --- a/packages/x11/driver/xf86-video-fglrx/build +++ b/packages/x11/driver/xf86-video-fglrx/build @@ -101,20 +101,21 @@ cd $ROOT/$PKG_BUILD mkdir -p $INSTALL_DIR/lib/xorg/modules/linux cp -P $BASEDIR/usr/X11R6/$LIBDIR/modules/linux/*.so $INSTALL_DIR/lib/xorg/modules/linux -if [ "$XVBA" = yes ]; then - cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL_DIR/lib - cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL_DIR/lib/libAMDXvBA.so.1 - cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL_DIR/lib/libXvBAW.so.1 +# disabled until we can expect non broken drivers from AMD: +# if [ "$XVBA" = yes ]; then +# cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL_DIR/lib +# cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL_DIR/lib/libAMDXvBA.so.1 +# cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL_DIR/lib/libXvBAW.so.1 -# install needed files for toolchain - mkdir -p $SYSROOT_PREFIX/usr/include/amd - cp $PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include/amd +# # install needed files for toolchain +# mkdir -p $SYSROOT_PREFIX/usr/include/amd +# cp $PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include/amd - mkdir -p $SYSROOT_PREFIX/usr/lib - cp arch/$FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib - ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1 - ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so -fi +# mkdir -p $SYSROOT_PREFIX/usr/lib +# cp arch/$FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib +# ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1 +# ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so +# fi ( cd $INSTALL_DIR/ diff --git a/packages/x11/driver/xf86-video-fglrx/meta b/packages/x11/driver/xf86-video-fglrx/meta index fe414e2ebd..844abf5999 100644 --- a/packages/x11/driver/xf86-video-fglrx/meta +++ b/packages/x11/driver/xf86-video-fglrx/meta @@ -35,3 +35,9 @@ PKG_LONGDESC="These binary drivers provide optimized hardware acceleration of Op PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +if [ "$XVBA" = yes ]; then +# hack around broken AMD drivers + PKG_DEPENDS="libXVBA" + PKG_BUILD_DEPENDS="toolchain libXVBA" +fi From d47d30a41cb512eecebdf7a0d6ca56554e5b5f03 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 15 Aug 2013 14:42:07 +0200 Subject: [PATCH 09/14] ffmpeg: fix last commit Signed-off-by: Stephan Raue --- packages/multimedia/ffmpeg/meta | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/multimedia/ffmpeg/meta b/packages/multimedia/ffmpeg/meta index 278af23b64..53985e81ce 100644 --- a/packages/multimedia/ffmpeg/meta +++ b/packages/multimedia/ffmpeg/meta @@ -59,7 +59,4 @@ if [ "$XVBA" = yes ]; then PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET xf86-video-fglrx-legacy" fi done - XBMC_XVBA="--enable-xvba" -else - XBMC_XVBA="--disable-xvba" fi From 54e0891b618c687610b3f8e15404f3fe9136e924 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 15 Aug 2013 17:50:16 +0300 Subject: [PATCH 10/14] bluez: update to bluez-5.8 --- packages/network/bluez/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk index 4f8f0d0430..9a23f3ca51 100644 --- a/packages/network/bluez/package.mk +++ b/packages/network/bluez/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bluez" -PKG_VERSION="5.7" +PKG_VERSION="5.8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 5400e261169712bf9adc517e1c478adddcb949b3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 15 Aug 2013 18:55:41 +0200 Subject: [PATCH 11/14] projects/RPi/linux: statically buildin uinput driver Signed-off-by: Stephan Raue --- projects/RPi/linux/linux.arm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 7d4fe2e870..09b642ab2d 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -1063,7 +1063,7 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_POWERMATE is not set # CONFIG_INPUT_YEALINK is not set # CONFIG_INPUT_CM109 is not set -CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_UINPUT=y # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # CONFIG_INPUT_ADXL34X is not set From 07c5840e8dbff4abf9266dc006fd3ad06f186736 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 15 Aug 2013 19:04:22 +0200 Subject: [PATCH 12/14] projects/*/linux: statically buildin coretemp driver Signed-off-by: Stephan Raue --- projects/ARCTIC_MC/linux/linux.x86_64.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic/linux/linux.x86_64.conf | 2 +- projects/Generic_OSS/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.i386.conf.deprecated | 2 +- projects/ION/linux/linux.x86_64.conf | 2 +- projects/Intel/linux/linux.i386.conf.deprecated | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- projects/Virtual/linux/linux.i386.conf | 2 +- projects/Virtual/linux/linux.x86_64.conf | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index df33e0a9b1..1237c7cde9 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -1855,7 +1855,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index e0f97691fc..4c50dc6a0d 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1880,7 +1880,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 4d369a5c27..5ca8bdab66 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1856,7 +1856,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 6b839f6805..af2835537b 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -1878,7 +1878,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/ION/linux/linux.i386.conf.deprecated b/projects/ION/linux/linux.i386.conf.deprecated index 2b1821f9a0..bad8fb406a 100644 --- a/projects/ION/linux/linux.i386.conf.deprecated +++ b/projects/ION/linux/linux.i386.conf.deprecated @@ -1808,7 +1808,7 @@ CONFIG_HWMON_VID=y # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index dbe731c5cc..8d3f3cf3e4 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1752,7 +1752,7 @@ CONFIG_HWMON_VID=y # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Intel/linux/linux.i386.conf.deprecated b/projects/Intel/linux/linux.i386.conf.deprecated index 74a7fb69f3..b786462907 100644 --- a/projects/Intel/linux/linux.i386.conf.deprecated +++ b/projects/Intel/linux/linux.i386.conf.deprecated @@ -1826,7 +1826,7 @@ CONFIG_HWMON_VID=y # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index c9269e92db..fc7ecfa497 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1783,7 +1783,7 @@ CONFIG_HWMON_VID=y # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 7097df3df7..4549278bb4 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -1879,7 +1879,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index df33e0a9b1..1237c7cde9 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -1855,7 +1855,7 @@ CONFIG_SENSORS_FAM15H_POWER=m # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_CORETEMP=y CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set From c68eb5ea87c01b7f7904bd42fb8e3eb6b42921ca Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 15 Aug 2013 19:08:23 +0200 Subject: [PATCH 13/14] linux: dont try to load 'coretemp' module Signed-off-by: Stephan Raue --- packages/linux/config/modules | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/linux/config/modules b/packages/linux/config/modules index 00dba836e4..36b7731525 100644 --- a/packages/linux/config/modules +++ b/packages/linux/config/modules @@ -2,5 +2,3 @@ # # This file contains the names of kernel modules that should be loaded # at boot time, one per line. Lines beginning with "#" are ignored. - -coretemp From ee9b463d05a6f367f5902e54bc38d2a5c823d9c1 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 15 Aug 2013 21:12:07 +0300 Subject: [PATCH 14/14] init: always spawn debugshell on fatal errors --- packages/initramfs/sysutils/busybox-initramfs/scripts/init | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index 04104c6f09..d897d08da8 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init @@ -129,11 +129,7 @@ # Display fatal error message # $1:action which caused error, $2:message echo "*** Error in $BOOT_STEP: $1: $2 ***" - if [ -z "$DEBUG" ]; then - halt - else - debug_shell - fi + debug_shell } break_after() {