From 0c80991b66ecc9768c4f69ae4c9fead9b82a9d6c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 04:25:27 -0300 Subject: xbmc-lts: remove libre suffix --- ...pplications-xbmc.desktop-does-nt-have-exe.patch | 27 ---- libre/xbmc-libre-lts/PKGBUILD | 155 --------------------- libre/xbmc-libre-lts/libnfs-header-changes.patch | 24 ---- libre/xbmc-libre-lts/xbmc.install | 24 ---- ...pplications-xbmc.desktop-does-nt-have-exe.patch | 27 ++++ libre/xbmc-lts/PKGBUILD | 154 ++++++++++++++++++++ libre/xbmc-lts/libnfs-header-changes.patch | 24 ++++ libre/xbmc-lts/xbmc.install | 24 ++++ 8 files changed, 229 insertions(+), 230 deletions(-) delete mode 100644 libre/xbmc-libre-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch delete mode 100644 libre/xbmc-libre-lts/PKGBUILD delete mode 100644 libre/xbmc-libre-lts/libnfs-header-changes.patch delete mode 100644 libre/xbmc-libre-lts/xbmc.install create mode 100644 libre/xbmc-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch create mode 100644 libre/xbmc-lts/PKGBUILD create mode 100644 libre/xbmc-lts/libnfs-header-changes.patch create mode 100644 libre/xbmc-lts/xbmc.install diff --git a/libre/xbmc-libre-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch b/libre/xbmc-libre-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch deleted file mode 100644 index 71841758e..000000000 --- a/libre/xbmc-libre-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 -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 ---- - 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-libre-lts/PKGBUILD b/libre/xbmc-libre-lts/PKGBUILD deleted file mode 100644 index 8a468d817..000000000 --- a/libre/xbmc-libre-lts/PKGBUILD +++ /dev/null @@ -1,155 +0,0 @@ -# Contributor (Arch): Sergej Pupykin -# Contributor (Arch): Brad Fanella -# Contributor (Arch): [vEX] -# Contributor (Arch): Zeqadious -# Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > -# Contributor (Arch): Bartłomiej Piotrowski -# Maintainer: André Silva - -_prefix=/usr - -_pkgname=xbmc -pkgname=xbmc-libre-lts -pkgver=12.3 -_codename=Frodo -pkgrel=7 -pkgdesc="A software media player and entertainment hub for digital media (Frodo version), without nonfree addons and unrar support" -arch=('i686' 'x86_64' 'mips64el') -url="http://xbmc.org" -license=('GPL2') -conflicts=($_pkgname) -provides=($_pkgname) -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' -'lirc: remote controller support' -'xorg-xinit: autostart xbmc' -'udisks: automount external drives' -'upower: display battery level' -) -install="${_pkgname}.install" -mksource=( - "http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" -) -source=( - "https://repo.parabolagnulinux.org/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' -) -mkmd5sums=( - '7ae385ebf8e5cfcb917393235e6efbdb' -) -md5sums=( - '10ed8b9cb84b2825d746c26bd5236899' - '7fd6399d2ffbdf06b724f0cc2efa0784' - '8998bc505ae4c66604c90b1c005be8c2' - '27f1e75d99977d5bdd3eee58921514cb' -) - -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" - - # 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 :#include :' 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.parabolagnulinux.org/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-libre-lts/libnfs-header-changes.patch b/libre/xbmc-libre-lts/libnfs-header-changes.patch deleted file mode 100644 index ef3d45e2c..000000000 --- a/libre/xbmc-libre-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 -+#include - #include - #include - -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 - #include - - #ifdef TARGET_WINDOWS diff --git a/libre/xbmc-libre-lts/xbmc.install b/libre/xbmc-libre-lts/xbmc.install deleted file mode 100644 index f90770bd5..000000000 --- a/libre/xbmc-libre-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.parabolagnulinux.org/index.php/Xbmc#Autostarting_at_boot" -} 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 new file mode 100644 index 000000000..71841758e --- /dev/null +++ b/libre/xbmc-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch @@ -0,0 +1,27 @@ +From 6abfd7104202121d3e23ddad47e377dfaef22b10 Mon Sep 17 00:00:00 2001 +From: BlackEagle +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 +--- + 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/PKGBUILD b/libre/xbmc-lts/PKGBUILD new file mode 100644 index 000000000..d75213de3 --- /dev/null +++ b/libre/xbmc-lts/PKGBUILD @@ -0,0 +1,154 @@ +# Contributor (Arch): Sergej Pupykin +# Contributor (Arch): Brad Fanella +# Contributor (Arch): [vEX] +# Contributor (Arch): Zeqadious +# Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Contributor (Arch): Bartłomiej Piotrowski +# Maintainer: André Silva + +_prefix=/usr + +_pkgname=xbmc-libre-lts +pkgname=xbmc-lts +pkgver=12.3 +_codename=Frodo +pkgrel=7 +pkgdesc="A software media player and entertainment hub for digital media (Frodo version), without nonfree addons and unrar support" +arch=('i686' 'x86_64' 'mips64el') +url="http://xbmc.org" +license=('GPL2') +conflicts=($_pkgname) +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' +'lirc: remote controller support' +'xorg-xinit: autostart xbmc' +'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.parabolagnulinux.org/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' +) +mkmd5sums=( + '7ae385ebf8e5cfcb917393235e6efbdb' +) +md5sums=( + '10ed8b9cb84b2825d746c26bd5236899' + '7fd6399d2ffbdf06b724f0cc2efa0784' + '8998bc505ae4c66604c90b1c005be8c2' + '27f1e75d99977d5bdd3eee58921514cb' +) + +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" + + # 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 :#include :' 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.parabolagnulinux.org/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 new file mode 100644 index 000000000..ef3d45e2c --- /dev/null +++ b/libre/xbmc-lts/libnfs-header-changes.patch @@ -0,0 +1,24 @@ +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 ++#include + #include + #include + +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 + #include + + #ifdef TARGET_WINDOWS diff --git a/libre/xbmc-lts/xbmc.install b/libre/xbmc-lts/xbmc.install new file mode 100644 index 000000000..f90770bd5 --- /dev/null +++ b/libre/xbmc-lts/xbmc.install @@ -0,0 +1,24 @@ +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.parabolagnulinux.org/index.php/Xbmc#Autostarting_at_boot" +} -- cgit v1.2.3