diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-01-18 11:06:09 -0200 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-01-18 11:06:09 -0200 |
commit | 5f73d029b9e32ff36d0d44793ee072e7c6b4e888 (patch) | |
tree | 34e00f186550dc284cc23c21754cc53b97008fee /libre/xbmc-lts | |
parent | 7454853bb6eb43bda8344d1178b5db4a3e41fcb2 (diff) |
rename xbmc to kodi, remove xbmc-lts
Diffstat (limited to 'libre/xbmc-lts')
8 files changed, 0 insertions, 371 deletions
diff --git a/libre/xbmc-lts/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch b/libre/xbmc-lts/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch deleted file mode 100644 index f2fc11b85..000000000 --- a/libre/xbmc-lts/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4037c9fd07fbec1873549e71e0b1c2833a5a87db Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Mon, 27 Oct 2014 14:42:30 +0100 -Subject: [PATCH 1/8] [CEC] fixed: don't try to stick a value > 255 in a byte - ---- - system/peripherals.xml | 2 +- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/system/peripherals.xml b/system/peripherals.xml -index 57af5d1..5fcff7c 100644 ---- a/system/peripherals.xml -+++ b/system/peripherals.xml -@@ -30,7 +30,7 @@ - <setting key="device_type" type="int" value="1" configurable="0" /> - <setting key="wake_devices_advanced" type="string" value="" configurable="0" /> - <setting key="standby_devices_advanced" type="string" value="" configurable="0" /> -- <setting key="double_tap_timeout_ms" type="int" min="0" value="2000" configurable="0" /> -+ <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" /> - </peripheral> - - <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec"> -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 9907ba2..1d068dc 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1347,8 +1347,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; - m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; - -- // double tap prevention timeout in ms -- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+ // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 -+ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50; - } - - void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) --- -2.1.2 - diff --git a/libre/xbmc-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch b/libre/xbmc-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch deleted file mode 100644 index 71841758e..000000000 --- a/libre/xbmc-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6abfd7104202121d3e23ddad47e377dfaef22b10 Mon Sep 17 00:00:00 2001 -From: BlackEagle <ike.devolder@gmail.com> -Date: Sun, 25 May 2014 12:10:01 +0200 -Subject: [PATCH] make sure applications/xbmc.desktop does'nt have executable - flag - -Signed-off-by: BlackEagle <ike.devolder@gmail.com> ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 754f153..bee1fdd 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -646,7 +646,7 @@ endif - endif - @# Icons and links - @install -d $(DESTDIR)$(datarootdir)/applications -- @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop -+ @install -m 0644 tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop - @install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps - @install -m 0644 media/icon48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png - @install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps --- -1.9.1 - diff --git a/libre/xbmc-lts/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch b/libre/xbmc-lts/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch deleted file mode 100644 index e8f583721..000000000 --- a/libre/xbmc-lts/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e59d7e028288464e6890141a830e4a83d4b9d065 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Mon, 27 Oct 2014 15:32:36 +0100 -Subject: [PATCH 3/8] [CEC] prevent bus rescan on a Pi, since the adapter - cannot be removed - ---- - xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -index b02535a..4941ae6 100644 ---- a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -+++ b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -@@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceScan(PeripheralScanResults &results) - break; - case ADAPTERTYPE_RPI: - result.m_mappedBusType = PERIPHERAL_BUS_RPI; -+ /** the Pi's adapter cannot be removed, no need to rescan */ -+ m_bNeedsPolling = false; - break; - default: - break; --- -2.1.2 - diff --git a/libre/xbmc-lts/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch b/libre/xbmc-lts/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch deleted file mode 100644 index 023257ca4..000000000 --- a/libre/xbmc-lts/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9f1e45a10860dd23239de35673643e9e0e4a74f8 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Tue, 28 Oct 2014 14:52:16 +0100 -Subject: [PATCH 5/8] [CEC] renamed the iDoubleTapTimeoutMs in the new libCEC - for clarity. does not change binary compatibility - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 1d068dc..ad123d9 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1347,8 +1347,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; - m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; - -+#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) - // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 -- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50; -+ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; -+#else -+ // backwards compatibility. will be removed once the next major release of libCEC is out -+ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+#endif - } - - void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) --- -2.1.2 - diff --git a/libre/xbmc-lts/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch b/libre/xbmc-lts/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch deleted file mode 100644 index cd533962a..000000000 --- a/libre/xbmc-lts/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fa01c108b60f74abb16992c1376bcca896093eac Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Tue, 28 Oct 2014 16:08:00 +0100 -Subject: [PATCH 6/8] [CEC] fixed - don't use CEC_CLIENT_VERSION_CURRENT for - the client version, because it will lead to issues when XBMC is rebuilt after - a libCEC bump that changes something - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index ad123d9..015daef 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1268,8 +1268,8 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu - - void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - { -- // use the same client version as libCEC version -- m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT; -+ // client version matches the version of libCEC that we originally used the API from -+ m_configuration.clientVersion = CEC_CLIENT_VERSION_2_2_0; - - // device name 'XBMC' - snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str()); --- -2.1.2 - diff --git a/libre/xbmc-lts/PKGBUILD b/libre/xbmc-lts/PKGBUILD deleted file mode 100644 index dc428191d..000000000 --- a/libre/xbmc-lts/PKGBUILD +++ /dev/null @@ -1,168 +0,0 @@ -# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> -# Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com> -# Contributor (Arch): Zeqadious <zeqadious.at.gmail.dot.com> -# Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > -# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> -# Maintainer: André Silva <emulatorman@parabola.nu> - -_prefix=/usr - -_pkgname=xbmc-libre-lts -pkgname=xbmc-lts -pkgver=12.3 -_codename=Frodo -pkgrel=11 -pkgdesc="A software media player and entertainment hub for digital media (Frodo version), without nonfree decompression engine for RAR archives and support for nonfree addons" -arch=('i686' 'x86_64' 'mips64el') -url="http://xbmc.org" -license=('GPL2') -replaces=($_pkgname) -conflicts=(${pkgname%-lts} $_pkgname) -provides=(${pkgname%-lts}) -depends=( -'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' -'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libpulse' 'libjpeg-turbo' 'libsamplerate' -'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'python2-pillow' -'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' -'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu' -'tinyxml' 'taglib' 'ffmpeg-compat' -) -makedepends=( -'boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' -'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-runtime-headless' -) -optdepends=( -'libcec: support for Pulse-Eight USB-CEC adapter' -'polkit: power management' -'lirc: remote controller support' -'udisks: automount external drives' -'upower: display battery level' -) -install="xbmc.install" -mksource=( - "http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" -) -source=( - "https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-$_codename.tar.gz" - "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285" - '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' - 'libnfs-header-changes.patch' - '0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch' - '0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch' - '0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch' - '0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch' -) -mkmd5sums=( - '7ae385ebf8e5cfcb917393235e6efbdb' -) -md5sums=( - '10ed8b9cb84b2825d746c26bd5236899' - '7fd6399d2ffbdf06b724f0cc2efa0784' - '8998bc505ae4c66604c90b1c005be8c2' - '27f1e75d99977d5bdd3eee58921514cb' - 'd00af955c000f285a230568004209117' - '3e810f451e58d5704cdd15b83552aa53' - 'b6346f66286195189e41839e9a23ef87' - '47b765e1d4299fac32bf92f108548d06' -) - -mksource() { - cd "${srcdir}/xbmc-$pkgver-$_codename" - - # remove nonfree unRAR utility files from the source - rm -rv lib/UnrarXLib -} - -prepare() { - cd "${srcdir}/xbmc-$pkgver-$_codename" - - patch -p0 <$srcdir/libass.patch - patch -p1 -i "$srcdir/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch" - patch -p1 -i "$srcdir/libnfs-header-changes.patch" - patch -Np1 -i "$srcdir/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch" - patch -Np1 -i "$srcdir/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch" - patch -Np1 -i "$srcdir/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch" - patch -Np1 -i "$srcdir/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch" - - # fix lsb_release dependency - sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp - sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp - - # use addons.xml from Parabola server (without nonfree addons support) - sed -i -e 's|mirrors[.]xbmc[.]org/addons/frodo/addons.xml|repo.parabola.nu/other/xbmc-libre-lts/addons/frodo/addons.xml|' addons/repository.xbmc.org/addon.xml -} - -build() { - cd "$srcdir/xbmc-$pkgver-$_codename" - - # Bootstrapping XBMC - ./bootstrap - - # Configuring XBMC - export PYTHON_VERSION=2 # external python v2 - export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH - ./configure --prefix=$_prefix --exec-prefix=$_prefix \ - --disable-debug \ - --enable-optimizations \ - --enable-gl \ - --enable-sdl \ - --enable-vaapi \ - --enable-vdpau \ - --enable-xvba \ - --enable-joystick \ - --enable-xrandr \ - --enable-rsxs \ - --enable-projectm \ - --enable-x11 \ - --enable-pulse \ - --enable-rtmp \ - --enable-samba \ - --enable-nfs \ - --enable-afpclient \ - --enable-airplay \ - --enable-airtunes \ - --enable-ffmpeg-libvorbis \ - --enable-dvdcss \ - --disable-hal \ - --enable-avahi \ - --enable-webserver \ - --enable-optical-drive \ - --enable-libbluray \ - --enable-texturepacker \ - --enable-udev \ - --enable-libusb \ - --enable-libcec \ - --enable-external-libraries \ - --with-lirc-device=/run/lirc/lircd \ - --enable-external-ffmpeg \ - --disable-non-free - - # Now (finally) build - make -} - -package() { - cd "$srcdir/xbmc-$pkgver-$_codename" - # Running make install - make DESTDIR="$pkgdir" install - - # run feh with python2 - sed -i -e 's/python/python2/g' ${pkgdir}$_prefix/bin/xbmc - - # lsb_release fix - sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}$_prefix/bin/xbmc" - sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}$_prefix/bin/xbmc" - - # Tools - install -D -m 0755 "$srcdir/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" \ - "${pkgdir}$_prefix/lib/xbmc/" - - # Licenses - install -dm755 "${pkgdir}$_prefix/share/licenses/$pkgname" - for licensef in LICENSE.GPL copying.txt; do - mv "${pkgdir}$_prefix/share/doc/xbmc/$licensef" \ - "${pkgdir}$_prefix/share/licenses/$pkgname" - done -} -# vim:set ts=2 sw=2 et: diff --git a/libre/xbmc-lts/libnfs-header-changes.patch b/libre/xbmc-lts/libnfs-header-changes.patch deleted file mode 100644 index ef3d45e2c..000000000 --- a/libre/xbmc-lts/libnfs-header-changes.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp -index 85084a5..8efa7bf 100644 ---- a/xbmc/filesystem/NFSDirectory.cpp -+++ b/xbmc/filesystem/NFSDirectory.cpp -@@ -37,6 +37,7 @@ - using namespace XFILE; - using namespace std; - #include <limits.h> -+#include <nfsc/libnfs-zdr.h> - #include <nfsc/libnfs-raw-mount.h> - #include <nfsc/libnfs-raw-nfs.h> - -diff --git a/xbmc/filesystem/NFSFile.cpp b/xbmc/filesystem/NFSFile.cpp -index 479f3fe..2aeea32 100644 ---- a/xbmc/filesystem/NFSFile.cpp -+++ b/xbmc/filesystem/NFSFile.cpp -@@ -32,6 +32,7 @@ - #include "network/DNSNameCache.h" - #include "threads/SystemClock.h" - -+#include <nfsc/libnfs-zdr.h> - #include <nfsc/libnfs-raw-mount.h> - - #ifdef TARGET_WINDOWS diff --git a/libre/xbmc-lts/xbmc.install b/libre/xbmc-lts/xbmc.install deleted file mode 100644 index 00ac17f74..000000000 --- a/libre/xbmc-lts/xbmc.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - update_icons - update_autostart -} - -post_upgrade() { - update_icons - update_autostart -} - -post_remove() { - update_icons - update_autostart -} - -update_icons() { - type -p gtk-update-icon-cache > /dev/null 2>&1 && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications - return 0 -} - -update_autostart() { - echo "To autostart xbmc standalone read: https://wiki.parabola.nu/index.php/Xbmc#Autostarting_at_boot" -} |