[arch-commits] Commit in kodi/repos (16 files)
Ike Devolder
idevolder at archlinux.org
Sun May 31 07:36:30 UTC 2015
Date: Sunday, May 31, 2015 @ 09:36:30
Author: idevolder
Revision: 134392
archrelease: copy trunk to community-i686, community-x86_64
Added:
kodi/repos/community-i686/PKGBUILD
(from rev 134391, kodi/trunk/PKGBUILD)
kodi/repos/community-i686/kodi-14.0-dvddemux-ffmpeg.patch
(from rev 134391, kodi/trunk/kodi-14.0-dvddemux-ffmpeg.patch)
kodi/repos/community-i686/kodi-14.0-gcc5.patch
(from rev 134391, kodi/trunk/kodi-14.0-gcc5.patch)
kodi/repos/community-i686/kodi.install
(from rev 134391, kodi/trunk/kodi.install)
kodi/repos/community-x86_64/PKGBUILD
(from rev 134391, kodi/trunk/PKGBUILD)
kodi/repos/community-x86_64/kodi-14.0-dvddemux-ffmpeg.patch
(from rev 134391, kodi/trunk/kodi-14.0-dvddemux-ffmpeg.patch)
kodi/repos/community-x86_64/kodi-14.0-gcc5.patch
(from rev 134391, kodi/trunk/kodi-14.0-gcc5.patch)
kodi/repos/community-x86_64/kodi.install
(from rev 134391, kodi/trunk/kodi.install)
Deleted:
kodi/repos/community-i686/PKGBUILD
kodi/repos/community-i686/kodi-14.0-dvddemux-ffmpeg.patch
kodi/repos/community-i686/kodi-14.0-gcc5.patch
kodi/repos/community-i686/kodi.install
kodi/repos/community-x86_64/PKGBUILD
kodi/repos/community-x86_64/kodi-14.0-dvddemux-ffmpeg.patch
kodi/repos/community-x86_64/kodi-14.0-gcc5.patch
kodi/repos/community-x86_64/kodi.install
--------------------------------------------------+
/PKGBUILD | 282 +++++++++++++++++++++
/kodi-14.0-dvddemux-ffmpeg.patch | 26 +
/kodi-14.0-gcc5.patch | 50 +++
/kodi.install | 34 ++
community-i686/PKGBUILD | 139 ----------
community-i686/kodi-14.0-dvddemux-ffmpeg.patch | 13
community-i686/kodi-14.0-gcc5.patch | 25 -
community-i686/kodi.install | 17 -
community-x86_64/PKGBUILD | 139 ----------
community-x86_64/kodi-14.0-dvddemux-ffmpeg.patch | 13
community-x86_64/kodi-14.0-gcc5.patch | 25 -
community-x86_64/kodi.install | 17 -
12 files changed, 392 insertions(+), 388 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-05-31 07:36:09 UTC (rev 134391)
+++ community-i686/PKGBUILD 2015-05-31 07:36:30 UTC (rev 134392)
@@ -1,139 +0,0 @@
-# vim:set ts=2 sw=2 et:
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
-# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Maxime Gauduin <alucryd at gmail.com>
-
-_prefix=/usr
-
-pkgbase=kodi
-pkgname=('kodi' 'kodi-eventclients')
-pkgver=14.2
-_codename=Helix
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://kodi.tv"
-license=('GPL2')
-makedepends=(
- 'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'ffmpeg'
- 'git' 'glew' 'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs'
- 'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd' 'libmpeg2'
- 'libnfs' 'libplist' 'libxrandr' 'libxslt' 'lzo' 'nasm' 'nss-mdns'
- 'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'sdl2'
- 'sdl_image' 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip'
- 'upower' 'yajl' 'zip'
-)
-source=(
- "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
- "kodi-14.0-dvddemux-ffmpeg.patch"
- "kodi-14.0-gcc5.patch"
-)
-sha256sums=('d9cb8590430a925fb789a5beb4da2695cdcd2d2500dd31126f3b77b31aa267f4'
- '01453e18987b01ad40c9ae423a7e47422e537b648e74f5c942f132c37e6370f8'
- '598f36cea0f63440e5755d88752552240fc5cd2b98e4f80a9feeb9605c917777')
-
-prepare() {
- cd "$srcdir/xbmc-$pkgver-$_codename"
-
- find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" +
- sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl
- sed 's/python/python2/' -i tools/Linux/kodi.sh.in
- sed 's/shell python/shell python2/' -i tools/EventClients/Makefile.in
- # disable wiiremote due to incompatibility with bluez-5.29
- sed '/WiiRemote/d' -i tools/EventClients/Makefile.in
- sed '/mkdir -p $(DESTDIR)$(bindir)/i \
-install:' -i tools/EventClients/Makefile.in
-
- patch -p0 -i "$srcdir/kodi-14.0-dvddemux-ffmpeg.patch"
- patch -p1 -i "$srcdir/kodi-14.0-gcc5.patch"
-
-}
-
-build() {
- cd "$srcdir/xbmc-$pkgver-$_codename"
-
- # Bootstrapping
- MAKEFLAGS=-j1 ./bootstrap
-
- #./configure --help
- #return 1
-
- # Configuring XBMC
- export PYTHON_VERSION=2 # external python v2
- ./configure --prefix=$_prefix --exec-prefix=$_prefix \
- --disable-debug \
- --enable-optimizations \
- --enable-libbluray \
- --with-ffmpeg=shared \
- --with-lirc-device=/run/lirc/lircd \
- ac_cv_lib_bluetooth_hci_devid=no
-
- # Now (finally) build
- make
-}
-
-package_kodi() {
- pkgdesc="A software media player and entertainment hub for digital media"
-
- # depends expected for kodi plugins:
- # 'python2-pillow' 'python2-pybluez' 'python2-simplejson'
- # depends expeced in FEH.py
- # 'mesa-demos' 'xorg-xdpyinfo'
- depends=(
- 'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'mesa-demos'
- 'xorg-xdpyinfo' 'bluez-libs' 'ffmpeg' 'glew' 'hicolor-icon-theme' 'libcdio'
- 'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libxrandr' 'libxslt'
- 'lzo' 'sdl2' 'smbclient' 'taglib' 'tinyxml' 'yajl'
- )
- optdepends=(
- 'afpfs-ng: Apple shares support'
- 'bluez: Blutooth support'
- 'libnfs: NFS shares support'
- 'libplist: AirPlay support'
- 'libcec: Pulse-Eight USB-CEC adapter support'
- 'lirc: Remote controller support'
- 'pulseaudio: PulseAudio support'
- 'shairplay: AirPlay support'
- 'udisks: Automount external drives'
- 'unrar: Archives support'
- 'unzip: Archives support'
- 'upower: Display battery level'
- 'lsb-release: log distro information in crashlog'
- )
- install="kodi.install"
- provides=('xbmc')
- conflicts=('xbmc')
- replaces=('xbmc')
-
- cd "$srcdir/xbmc-$pkgver-$_codename"
- # Running make install
- make DESTDIR="$pkgdir" install
-
- # We will no longer support the xbmc name
- rm "$pkgdir/usr/share/xsessions/xbmc.desktop"
- rm "$pkgdir/usr/bin/"xbmc{,-standalone}
- # we will leave /usr/{include,lib,share}/xbmc for now
-
- # Licenses
- install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname}
- for licensef in LICENSE.GPL copying.txt; do
- mv ${pkgdir}${_prefix}/share/doc/kodi/${licensef} \
- ${pkgdir}${_prefix}/share/licenses/${pkgname}
- done
-}
-
-package_kodi-eventclients() {
- pkgdesc="Kodi Event Clients"
-
- depends=('cwiid')
-
- cd "$srcdir/xbmc-$pkgver-$_codename"
-
- make DESTDIR="$pkgdir" eventclients WII_EXTRA_OPTS=-DCWIID_OLD
-}
-
Copied: kodi/repos/community-i686/PKGBUILD (from rev 134391, kodi/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-05-31 07:36:30 UTC (rev 134392)
@@ -0,0 +1,141 @@
+# vim:set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
+# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
+# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Maxime Gauduin <alucryd at gmail.com>
+
+_prefix=/usr
+
+pkgbase=kodi
+pkgname=('kodi' 'kodi-eventclients')
+pkgver=14.2
+_codename=Helix
+pkgrel=5
+arch=('i686' 'x86_64')
+url="http://kodi.tv"
+license=('GPL2')
+makedepends=(
+ 'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'git' 'glew'
+ 'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' 'libass'
+ 'libbluray' 'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd'
+ 'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libssh' 'libva'
+ 'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow'
+ 'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'sdl2' 'sdl_image'
+ 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' 'yajl' 'zip'
+)
+source=(
+ "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
+ "kodi-14.0-dvddemux-ffmpeg.patch"
+ "kodi-14.0-gcc5.patch"
+)
+sha256sums=('d9cb8590430a925fb789a5beb4da2695cdcd2d2500dd31126f3b77b31aa267f4'
+ '01453e18987b01ad40c9ae423a7e47422e537b648e74f5c942f132c37e6370f8'
+ '598f36cea0f63440e5755d88752552240fc5cd2b98e4f80a9feeb9605c917777')
+
+prepare() {
+ cd "$srcdir/xbmc-$pkgver-$_codename"
+
+ find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" +
+ sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl
+ sed 's/python/python2/' -i tools/Linux/kodi.sh.in
+ sed 's/shell python/shell python2/' -i tools/EventClients/Makefile.in
+ # disable wiiremote due to incompatibility with bluez-5.29
+ sed '/WiiRemote/d' -i tools/EventClients/Makefile.in
+ sed '/mkdir -p $(DESTDIR)$(bindir)/i \
+install:' -i tools/EventClients/Makefile.in
+
+ patch -p0 -i "$srcdir/kodi-14.0-dvddemux-ffmpeg.patch"
+ patch -p1 -i "$srcdir/kodi-14.0-gcc5.patch"
+
+}
+
+build() {
+ cd "$srcdir/xbmc-$pkgver-$_codename"
+
+ # Bootstrapping
+ MAKEFLAGS=-j1 ./bootstrap
+
+ #./configure --help
+ #return 1
+
+ # Configuring XBMC
+ export PYTHON_VERSION=2 # external python v2
+ ./configure --prefix=$_prefix --exec-prefix=$_prefix \
+ --disable-debug \
+ --enable-optimizations \
+ --enable-libbluray \
+ --enable-shared-libraries \
+ --with-lirc-device=/run/lirc/lircd \
+ ac_cv_lib_bluetooth_hci_devid=no
+
+ # Now (finally) build
+ make
+}
+
+package_kodi() {
+ pkgdesc="A software media player and entertainment hub for digital media"
+
+ # depends expected for kodi plugins:
+ # 'python2-pillow' 'python2-pybluez' 'python2-simplejson'
+ # depends expeced in FEH.py
+ # 'mesa-demos' 'xorg-xdpyinfo'
+ depends=(
+ 'python2-pillow' 'python2-pybluez' 'python2-simplejson'
+ 'mesa-demos' 'xorg-xdpyinfo'
+ 'bluez-libs' 'fribidi' 'glew' 'hicolor-icon-theme' 'libcdio'
+ 'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libpulse' 'libssh'
+ 'libva' 'libxrandr' 'libxslt' 'lzo' 'sdl2' 'smbclient' 'taglib' 'tinyxml'
+ 'yajl'
+ )
+ optdepends=(
+ 'afpfs-ng: Apple shares support'
+ 'bluez: Blutooth support'
+ 'libnfs: NFS shares support'
+ 'libplist: AirPlay support'
+ 'libcec: Pulse-Eight USB-CEC adapter support'
+ 'lirc: Remote controller support'
+ 'pulseaudio: PulseAudio support'
+ 'shairplay: AirPlay support'
+ 'udisks: Automount external drives'
+ 'unrar: Archives support'
+ 'unzip: Archives support'
+ 'upower: Display battery level'
+ 'lsb-release: log distro information in crashlog'
+ )
+ install="kodi.install"
+ provides=('xbmc')
+ conflicts=('xbmc')
+ replaces=('xbmc')
+
+ cd "$srcdir/xbmc-$pkgver-$_codename"
+ # Running make install
+ make DESTDIR="$pkgdir" install
+
+ # We will no longer support the xbmc name
+ rm "$pkgdir/usr/share/xsessions/xbmc.desktop"
+ rm "$pkgdir/usr/bin/"xbmc{,-standalone}
+ # we will leave /usr/{include,lib,share}/xbmc for now
+
+ # Licenses
+ install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname}
+ for licensef in LICENSE.GPL copying.txt; do
+ mv ${pkgdir}${_prefix}/share/doc/kodi/${licensef} \
+ ${pkgdir}${_prefix}/share/licenses/${pkgname}
+ done
+}
+
+package_kodi-eventclients() {
+ pkgdesc="Kodi Event Clients"
+
+ depends=('cwiid')
+
+ cd "$srcdir/xbmc-$pkgver-$_codename"
+
+ make DESTDIR="$pkgdir" eventclients WII_EXTRA_OPTS=-DCWIID_OLD
+}
+
Deleted: community-i686/kodi-14.0-dvddemux-ffmpeg.patch
===================================================================
--- community-i686/kodi-14.0-dvddemux-ffmpeg.patch 2015-05-31 07:36:09 UTC (rev 134391)
+++ community-i686/kodi-14.0-dvddemux-ffmpeg.patch 2015-05-31 07:36:30 UTC (rev 134392)
@@ -1,13 +0,0 @@
---- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig 2014-08-01 11:18:24.000000000 -0500
-+++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-08-24 15:36:34.844966866 -0500
-@@ -519,10 +519,6 @@
-
- void CDVDDemuxFFmpeg::Flush()
- {
-- // naughty usage of an internal ffmpeg function
-- if (m_pFormatContext)
-- av_read_frame_flush(m_pFormatContext);
--
- m_currentPts = DVD_NOPTS_VALUE;
-
- m_pkt.result = -1;
Copied: kodi/repos/community-i686/kodi-14.0-dvddemux-ffmpeg.patch (from rev 134391, kodi/trunk/kodi-14.0-dvddemux-ffmpeg.patch)
===================================================================
--- community-i686/kodi-14.0-dvddemux-ffmpeg.patch (rev 0)
+++ community-i686/kodi-14.0-dvddemux-ffmpeg.patch 2015-05-31 07:36:30 UTC (rev 134392)
@@ -0,0 +1,13 @@
+--- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig 2014-08-01 11:18:24.000000000 -0500
++++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-08-24 15:36:34.844966866 -0500
+@@ -519,10 +519,6 @@
+
+ void CDVDDemuxFFmpeg::Flush()
+ {
+- // naughty usage of an internal ffmpeg function
+- if (m_pFormatContext)
+- av_read_frame_flush(m_pFormatContext);
+-
+ m_currentPts = DVD_NOPTS_VALUE;
+
+ m_pkt.result = -1;
Deleted: community-i686/kodi-14.0-gcc5.patch
===================================================================
--- community-i686/kodi-14.0-gcc5.patch 2015-05-31 07:36:09 UTC (rev 134391)
+++ community-i686/kodi-14.0-gcc5.patch 2015-05-31 07:36:30 UTC (rev 134392)
@@ -1,25 +0,0 @@
---- a/xbmc/screensavers/rsxs-0.9/lib/argp.h.orig 2015-03-26 13:25:20.000000000 -0500
-+++ b/xbmc/screensavers/rsxs-0.9/lib/argp.h 2015-05-19 16:05:20.992493851 -0500
-@@ -559,7 +559,7 @@
- # endif
-
- # ifndef ARGP_EI
--# define ARGP_EI extern __inline__
-+# define ARGP_EI extern __inline__ __attribute__ ((gnu_inline))
- # endif
-
- ARGP_EI void
---- a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h.orig 2015-03-26 13:25:20.000000000 -0500
-+++ b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h 2015-05-19 16:02:25.775456866 -0500
-@@ -198,11 +198,7 @@
- #endif
-
- #ifndef ARGP_FS_EI
--#ifdef __clang__
- #define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__))
--#else
--#define ARGP_FS_EI extern inline
--#endif
- #endif
-
- ARGP_FS_EI size_t
Copied: kodi/repos/community-i686/kodi-14.0-gcc5.patch (from rev 134391, kodi/trunk/kodi-14.0-gcc5.patch)
===================================================================
--- community-i686/kodi-14.0-gcc5.patch (rev 0)
+++ community-i686/kodi-14.0-gcc5.patch 2015-05-31 07:36:30 UTC (rev 134392)
@@ -0,0 +1,25 @@
+--- a/xbmc/screensavers/rsxs-0.9/lib/argp.h.orig 2015-03-26 13:25:20.000000000 -0500
++++ b/xbmc/screensavers/rsxs-0.9/lib/argp.h 2015-05-19 16:05:20.992493851 -0500
+@@ -559,7 +559,7 @@
+ # endif
+
+ # ifndef ARGP_EI
+-# define ARGP_EI extern __inline__
++# define ARGP_EI extern __inline__ __attribute__ ((gnu_inline))
+ # endif
+
+ ARGP_EI void
+--- a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h.orig 2015-03-26 13:25:20.000000000 -0500
++++ b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h 2015-05-19 16:02:25.775456866 -0500
+@@ -198,11 +198,7 @@
+ #endif
+
+ #ifndef ARGP_FS_EI
+-#ifdef __clang__
+ #define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__))
+-#else
+-#define ARGP_FS_EI extern inline
+-#endif
+ #endif
+
+ ARGP_FS_EI size_t
Deleted: community-i686/kodi.install
===================================================================
--- community-i686/kodi.install 2015-05-31 07:36:09 UTC (rev 134391)
+++ community-i686/kodi.install 2015-05-31 07:36:30 UTC (rev 134392)
@@ -1,17 +0,0 @@
-post_install() {
- update_icons
-}
-
-post_upgrade() {
- update_icons
-}
-
-post_remove() {
- update_icons
-}
-
-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
-}
Copied: kodi/repos/community-i686/kodi.install (from rev 134391, kodi/trunk/kodi.install)
===================================================================
--- community-i686/kodi.install (rev 0)
+++ community-i686/kodi.install 2015-05-31 07:36:30 UTC (rev 134392)
@@ -0,0 +1,17 @@
+post_install() {
+ update_icons
+}
+
+post_upgrade() {
+ update_icons
+}
+
+post_remove() {
+ update_icons
+}
+
+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
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-05-31 07:36:09 UTC (rev 134391)
+++ community-x86_64/PKGBUILD 2015-05-31 07:36:30 UTC (rev 134392)
@@ -1,139 +0,0 @@
-# vim:set ts=2 sw=2 et:
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
-# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Maxime Gauduin <alucryd at gmail.com>
-
-_prefix=/usr
-
-pkgbase=kodi
-pkgname=('kodi' 'kodi-eventclients')
-pkgver=14.2
-_codename=Helix
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://kodi.tv"
-license=('GPL2')
-makedepends=(
- 'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'ffmpeg'
- 'git' 'glew' 'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs'
- 'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd' 'libmpeg2'
- 'libnfs' 'libplist' 'libxrandr' 'libxslt' 'lzo' 'nasm' 'nss-mdns'
- 'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'sdl2'
- 'sdl_image' 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip'
- 'upower' 'yajl' 'zip'
-)
-source=(
- "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
- "kodi-14.0-dvddemux-ffmpeg.patch"
- "kodi-14.0-gcc5.patch"
-)
-sha256sums=('d9cb8590430a925fb789a5beb4da2695cdcd2d2500dd31126f3b77b31aa267f4'
- '01453e18987b01ad40c9ae423a7e47422e537b648e74f5c942f132c37e6370f8'
- '598f36cea0f63440e5755d88752552240fc5cd2b98e4f80a9feeb9605c917777')
-
-prepare() {
- cd "$srcdir/xbmc-$pkgver-$_codename"
-
- find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" +
- sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl
- sed 's/python/python2/' -i tools/Linux/kodi.sh.in
- sed 's/shell python/shell python2/' -i tools/EventClients/Makefile.in
- # disable wiiremote due to incompatibility with bluez-5.29
- sed '/WiiRemote/d' -i tools/EventClients/Makefile.in
- sed '/mkdir -p $(DESTDIR)$(bindir)/i \
-install:' -i tools/EventClients/Makefile.in
-
- patch -p0 -i "$srcdir/kodi-14.0-dvddemux-ffmpeg.patch"
- patch -p1 -i "$srcdir/kodi-14.0-gcc5.patch"
-
-}
-
-build() {
- cd "$srcdir/xbmc-$pkgver-$_codename"
-
- # Bootstrapping
- MAKEFLAGS=-j1 ./bootstrap
-
- #./configure --help
- #return 1
-
- # Configuring XBMC
- export PYTHON_VERSION=2 # external python v2
- ./configure --prefix=$_prefix --exec-prefix=$_prefix \
- --disable-debug \
- --enable-optimizations \
- --enable-libbluray \
- --with-ffmpeg=shared \
- --with-lirc-device=/run/lirc/lircd \
- ac_cv_lib_bluetooth_hci_devid=no
-
- # Now (finally) build
- make
-}
-
-package_kodi() {
- pkgdesc="A software media player and entertainment hub for digital media"
-
- # depends expected for kodi plugins:
- # 'python2-pillow' 'python2-pybluez' 'python2-simplejson'
- # depends expeced in FEH.py
- # 'mesa-demos' 'xorg-xdpyinfo'
- depends=(
- 'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'mesa-demos'
- 'xorg-xdpyinfo' 'bluez-libs' 'ffmpeg' 'glew' 'hicolor-icon-theme' 'libcdio'
- 'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libxrandr' 'libxslt'
- 'lzo' 'sdl2' 'smbclient' 'taglib' 'tinyxml' 'yajl'
- )
- optdepends=(
- 'afpfs-ng: Apple shares support'
- 'bluez: Blutooth support'
- 'libnfs: NFS shares support'
- 'libplist: AirPlay support'
- 'libcec: Pulse-Eight USB-CEC adapter support'
- 'lirc: Remote controller support'
- 'pulseaudio: PulseAudio support'
- 'shairplay: AirPlay support'
- 'udisks: Automount external drives'
- 'unrar: Archives support'
- 'unzip: Archives support'
- 'upower: Display battery level'
- 'lsb-release: log distro information in crashlog'
- )
- install="kodi.install"
- provides=('xbmc')
- conflicts=('xbmc')
- replaces=('xbmc')
-
- cd "$srcdir/xbmc-$pkgver-$_codename"
- # Running make install
- make DESTDIR="$pkgdir" install
-
- # We will no longer support the xbmc name
- rm "$pkgdir/usr/share/xsessions/xbmc.desktop"
- rm "$pkgdir/usr/bin/"xbmc{,-standalone}
- # we will leave /usr/{include,lib,share}/xbmc for now
-
- # Licenses
- install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname}
- for licensef in LICENSE.GPL copying.txt; do
- mv ${pkgdir}${_prefix}/share/doc/kodi/${licensef} \
- ${pkgdir}${_prefix}/share/licenses/${pkgname}
- done
-}
-
-package_kodi-eventclients() {
- pkgdesc="Kodi Event Clients"
-
- depends=('cwiid')
-
- cd "$srcdir/xbmc-$pkgver-$_codename"
-
- make DESTDIR="$pkgdir" eventclients WII_EXTRA_OPTS=-DCWIID_OLD
-}
-
Copied: kodi/repos/community-x86_64/PKGBUILD (from rev 134391, kodi/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-05-31 07:36:30 UTC (rev 134392)
@@ -0,0 +1,141 @@
+# vim:set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
+# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
+# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Maxime Gauduin <alucryd at gmail.com>
+
+_prefix=/usr
+
+pkgbase=kodi
+pkgname=('kodi' 'kodi-eventclients')
+pkgver=14.2
+_codename=Helix
+pkgrel=5
+arch=('i686' 'x86_64')
+url="http://kodi.tv"
+license=('GPL2')
+makedepends=(
+ 'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'git' 'glew'
+ 'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' 'libass'
+ 'libbluray' 'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd'
+ 'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libssh' 'libva'
+ 'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow'
+ 'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'sdl2' 'sdl_image'
+ 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' 'yajl' 'zip'
+)
+source=(
+ "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
+ "kodi-14.0-dvddemux-ffmpeg.patch"
+ "kodi-14.0-gcc5.patch"
+)
+sha256sums=('d9cb8590430a925fb789a5beb4da2695cdcd2d2500dd31126f3b77b31aa267f4'
+ '01453e18987b01ad40c9ae423a7e47422e537b648e74f5c942f132c37e6370f8'
+ '598f36cea0f63440e5755d88752552240fc5cd2b98e4f80a9feeb9605c917777')
+
+prepare() {
+ cd "$srcdir/xbmc-$pkgver-$_codename"
+
+ find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" +
+ sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl
+ sed 's/python/python2/' -i tools/Linux/kodi.sh.in
+ sed 's/shell python/shell python2/' -i tools/EventClients/Makefile.in
+ # disable wiiremote due to incompatibility with bluez-5.29
+ sed '/WiiRemote/d' -i tools/EventClients/Makefile.in
+ sed '/mkdir -p $(DESTDIR)$(bindir)/i \
+install:' -i tools/EventClients/Makefile.in
+
+ patch -p0 -i "$srcdir/kodi-14.0-dvddemux-ffmpeg.patch"
+ patch -p1 -i "$srcdir/kodi-14.0-gcc5.patch"
+
+}
+
+build() {
+ cd "$srcdir/xbmc-$pkgver-$_codename"
+
+ # Bootstrapping
+ MAKEFLAGS=-j1 ./bootstrap
+
+ #./configure --help
+ #return 1
+
+ # Configuring XBMC
+ export PYTHON_VERSION=2 # external python v2
+ ./configure --prefix=$_prefix --exec-prefix=$_prefix \
+ --disable-debug \
+ --enable-optimizations \
+ --enable-libbluray \
+ --enable-shared-libraries \
+ --with-lirc-device=/run/lirc/lircd \
+ ac_cv_lib_bluetooth_hci_devid=no
+
+ # Now (finally) build
+ make
+}
+
+package_kodi() {
+ pkgdesc="A software media player and entertainment hub for digital media"
+
+ # depends expected for kodi plugins:
+ # 'python2-pillow' 'python2-pybluez' 'python2-simplejson'
+ # depends expeced in FEH.py
+ # 'mesa-demos' 'xorg-xdpyinfo'
+ depends=(
+ 'python2-pillow' 'python2-pybluez' 'python2-simplejson'
+ 'mesa-demos' 'xorg-xdpyinfo'
+ 'bluez-libs' 'fribidi' 'glew' 'hicolor-icon-theme' 'libcdio'
+ 'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libpulse' 'libssh'
+ 'libva' 'libxrandr' 'libxslt' 'lzo' 'sdl2' 'smbclient' 'taglib' 'tinyxml'
+ 'yajl'
+ )
+ optdepends=(
+ 'afpfs-ng: Apple shares support'
+ 'bluez: Blutooth support'
+ 'libnfs: NFS shares support'
+ 'libplist: AirPlay support'
+ 'libcec: Pulse-Eight USB-CEC adapter support'
+ 'lirc: Remote controller support'
+ 'pulseaudio: PulseAudio support'
+ 'shairplay: AirPlay support'
+ 'udisks: Automount external drives'
+ 'unrar: Archives support'
+ 'unzip: Archives support'
+ 'upower: Display battery level'
+ 'lsb-release: log distro information in crashlog'
+ )
+ install="kodi.install"
+ provides=('xbmc')
+ conflicts=('xbmc')
+ replaces=('xbmc')
+
+ cd "$srcdir/xbmc-$pkgver-$_codename"
+ # Running make install
+ make DESTDIR="$pkgdir" install
+
+ # We will no longer support the xbmc name
+ rm "$pkgdir/usr/share/xsessions/xbmc.desktop"
+ rm "$pkgdir/usr/bin/"xbmc{,-standalone}
+ # we will leave /usr/{include,lib,share}/xbmc for now
+
+ # Licenses
+ install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname}
+ for licensef in LICENSE.GPL copying.txt; do
+ mv ${pkgdir}${_prefix}/share/doc/kodi/${licensef} \
+ ${pkgdir}${_prefix}/share/licenses/${pkgname}
+ done
+}
+
+package_kodi-eventclients() {
+ pkgdesc="Kodi Event Clients"
+
+ depends=('cwiid')
+
+ cd "$srcdir/xbmc-$pkgver-$_codename"
+
+ make DESTDIR="$pkgdir" eventclients WII_EXTRA_OPTS=-DCWIID_OLD
+}
+
Deleted: community-x86_64/kodi-14.0-dvddemux-ffmpeg.patch
===================================================================
--- community-x86_64/kodi-14.0-dvddemux-ffmpeg.patch 2015-05-31 07:36:09 UTC (rev 134391)
+++ community-x86_64/kodi-14.0-dvddemux-ffmpeg.patch 2015-05-31 07:36:30 UTC (rev 134392)
@@ -1,13 +0,0 @@
---- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig 2014-08-01 11:18:24.000000000 -0500
-+++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-08-24 15:36:34.844966866 -0500
-@@ -519,10 +519,6 @@
-
- void CDVDDemuxFFmpeg::Flush()
- {
-- // naughty usage of an internal ffmpeg function
-- if (m_pFormatContext)
-- av_read_frame_flush(m_pFormatContext);
--
- m_currentPts = DVD_NOPTS_VALUE;
-
- m_pkt.result = -1;
Copied: kodi/repos/community-x86_64/kodi-14.0-dvddemux-ffmpeg.patch (from rev 134391, kodi/trunk/kodi-14.0-dvddemux-ffmpeg.patch)
===================================================================
--- community-x86_64/kodi-14.0-dvddemux-ffmpeg.patch (rev 0)
+++ community-x86_64/kodi-14.0-dvddemux-ffmpeg.patch 2015-05-31 07:36:30 UTC (rev 134392)
@@ -0,0 +1,13 @@
+--- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig 2014-08-01 11:18:24.000000000 -0500
++++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-08-24 15:36:34.844966866 -0500
+@@ -519,10 +519,6 @@
+
+ void CDVDDemuxFFmpeg::Flush()
+ {
+- // naughty usage of an internal ffmpeg function
+- if (m_pFormatContext)
+- av_read_frame_flush(m_pFormatContext);
+-
+ m_currentPts = DVD_NOPTS_VALUE;
+
+ m_pkt.result = -1;
Deleted: community-x86_64/kodi-14.0-gcc5.patch
===================================================================
--- community-x86_64/kodi-14.0-gcc5.patch 2015-05-31 07:36:09 UTC (rev 134391)
+++ community-x86_64/kodi-14.0-gcc5.patch 2015-05-31 07:36:30 UTC (rev 134392)
@@ -1,25 +0,0 @@
---- a/xbmc/screensavers/rsxs-0.9/lib/argp.h.orig 2015-03-26 13:25:20.000000000 -0500
-+++ b/xbmc/screensavers/rsxs-0.9/lib/argp.h 2015-05-19 16:05:20.992493851 -0500
-@@ -559,7 +559,7 @@
- # endif
-
- # ifndef ARGP_EI
--# define ARGP_EI extern __inline__
-+# define ARGP_EI extern __inline__ __attribute__ ((gnu_inline))
- # endif
-
- ARGP_EI void
---- a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h.orig 2015-03-26 13:25:20.000000000 -0500
-+++ b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h 2015-05-19 16:02:25.775456866 -0500
-@@ -198,11 +198,7 @@
- #endif
-
- #ifndef ARGP_FS_EI
--#ifdef __clang__
- #define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__))
--#else
--#define ARGP_FS_EI extern inline
--#endif
- #endif
-
- ARGP_FS_EI size_t
Copied: kodi/repos/community-x86_64/kodi-14.0-gcc5.patch (from rev 134391, kodi/trunk/kodi-14.0-gcc5.patch)
===================================================================
--- community-x86_64/kodi-14.0-gcc5.patch (rev 0)
+++ community-x86_64/kodi-14.0-gcc5.patch 2015-05-31 07:36:30 UTC (rev 134392)
@@ -0,0 +1,25 @@
+--- a/xbmc/screensavers/rsxs-0.9/lib/argp.h.orig 2015-03-26 13:25:20.000000000 -0500
++++ b/xbmc/screensavers/rsxs-0.9/lib/argp.h 2015-05-19 16:05:20.992493851 -0500
+@@ -559,7 +559,7 @@
+ # endif
+
+ # ifndef ARGP_EI
+-# define ARGP_EI extern __inline__
++# define ARGP_EI extern __inline__ __attribute__ ((gnu_inline))
+ # endif
+
+ ARGP_EI void
+--- a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h.orig 2015-03-26 13:25:20.000000000 -0500
++++ b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h 2015-05-19 16:02:25.775456866 -0500
+@@ -198,11 +198,7 @@
+ #endif
+
+ #ifndef ARGP_FS_EI
+-#ifdef __clang__
+ #define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__))
+-#else
+-#define ARGP_FS_EI extern inline
+-#endif
+ #endif
+
+ ARGP_FS_EI size_t
Deleted: community-x86_64/kodi.install
===================================================================
--- community-x86_64/kodi.install 2015-05-31 07:36:09 UTC (rev 134391)
+++ community-x86_64/kodi.install 2015-05-31 07:36:30 UTC (rev 134392)
@@ -1,17 +0,0 @@
-post_install() {
- update_icons
-}
-
-post_upgrade() {
- update_icons
-}
-
-post_remove() {
- update_icons
-}
-
-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
-}
Copied: kodi/repos/community-x86_64/kodi.install (from rev 134391, kodi/trunk/kodi.install)
===================================================================
--- community-x86_64/kodi.install (rev 0)
+++ community-x86_64/kodi.install 2015-05-31 07:36:30 UTC (rev 134392)
@@ -0,0 +1,17 @@
+post_install() {
+ update_icons
+}
+
+post_upgrade() {
+ update_icons
+}
+
+post_remove() {
+ update_icons
+}
+
+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
+}
More information about the arch-commits
mailing list