[SCM] xbmc/master: Convert source package to provide only transitional packages to Kodi
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Wed Aug 19 20:49:41 UTC 2015
The following commit has been merged in the master branch:
commit 206159190df0a26683b6b9798912500beb2b6e8a
Author: Balint Reczey <balint at balintreczey.hu>
Date: Sun Aug 16 11:38:43 2015 +0200
Convert source package to provide only transitional packages to Kodi
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index e77f737..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,25 +0,0 @@
-XBMC from Debian
-----------------
-
-This package is different from the package you can build from the XBMC source
-you can download from http://xbmc.org (vanilla XBMC, from now on).
-This package uses external libraries such as libav distributed in Debian, while
-the XBMC project suggests using the libraries embedded in vanilla XBMC's source.
-This difference may cause problems not experienced with vanilla XBMC thus you
-are kindly asked not to report bugs directly to http://xbmc.org, but to Debian's
-BTS [1].
-You can get an overview of the package at Debian PTS [2] or the list of open
-bugs at [3].
-
-XBMC for different Kernels and Architectures
---------------------------------------------
-
-XBMC is known to build on i386, amd64, powerpc, arm and armhf in Debian [4].
-If you are able to build and run XBMC on other architectures and/or kernels,
-please provide patches to configure.in and any other files you may have modified
-to the Debian BTS.
-
-[1] http://www.debian.org/Bugs/
-[2] http://packages.qa.debian.org/x/xbmc.html
-[3] http://bugs.debian.org/cgi-bin/pkgreport.cgi?repeatmerged=no&src=xbmc
-[4] https://buildd.debian.org/status/package.php?p=xbmc&suite=sid
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..df12473
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,3 @@
+This is only a transition package to move to Kodi packages
+
+ -- Balint Reczey <rbalint at chaos.sz13.dyndns.org>, Sat, 15 Aug 2015 23:53:48 +0200
diff --git a/debian/control b/debian/control
index 8b4582d..2fb7395 100644
--- a/debian/control
+++ b/debian/control
@@ -1,114 +1,10 @@
Source: xbmc
-Section: video
+Section: oldlibs
Priority: optional
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
Uploaders: Balint Reczey <balint at balintreczey.hu>
Build-Depends: debhelper (>= 9~),
- dh-python,
- cmake,
- autopoint,
- autotools-dev,
- autoconf,
- automake,
- dh-autoreconf,
- unzip,
- libboost-dev,
- zip,
- libtool,
- libgles2-mesa-dev [armel armhf] | libgl1-mesa-dev | libgl-dev,
- libglu1-mesa-dev | libglu-dev,
- libftgl-dev,
- libglew-dev,
- libmad0-dev,
- libjpeg-dev,
- libsamplerate-dev,
- libogg-dev,
- libvorbis-dev,
- libfreetype6-dev,
- libfontconfig-dev,
- libbz2-dev,
- libfribidi-dev,
- libsqlite3-dev,
- libmysqlclient-dev,
- libasound2-dev | libasound-dev,
- libpng12-dev | libpng-dev,
- libpcre3-dev,
- liblzo2-dev,
- libcdio-dev,
- libsdl-dev,
- libsdl-image1.2-dev,
- libsdl-mixer1.2-dev,
- libenca-dev,
- libjasper-dev,
- libxt-dev,
- libxmu-dev,
- libcurl4-gnutls-dev | libcurl-dev,
- libdbus-1-dev,
- libpulse-dev,
- libavahi-common-dev,
- libavahi-client-dev,
- libxrandr-dev,
- libmpeg2-4-dev,
- libass-dev (>= 0.9.8),
- libflac-dev,
- python-dev (>= 2.6.6-3~),
- gawk,
- gperf,
- nasm [i386],
- yasm,
- libcwiid-dev [linux-any],
- libbluetooth-dev,
- zlib1g-dev,
- libsmbclient-dev,
- libiso9660-dev,
- libssl-dev,
- libvdpau-dev [!armel !armhf !mipsel !mips],
- libmicrohttpd-dev,
- libmodplug-dev,
- librtmp-dev,
- libcrystalhd-dev [i386 amd64],
- curl,
- libyajl-dev,
- libboost-thread-dev,
- libomxil-bellagio-dev [armel armhf mipsel mips],
- python-imaging,
- libplist-dev,
- libcec-dev (>= 2),
- libudev-dev,
- udev,
- libshairport-dev,
- libnfs-dev,
- libltdl-dev,
- libtiff-dev,
- libtinyxml-dev (>= 2.6.2),
- libxslt1-dev,
- libmp3lame-dev,
- libssh-dev,
- libtag1-dev (>= 1.8),
- swig,
- default-jre,
- libbluray-dev,
- libva-dev [!armel !armhf !mipsel !mips],
- libavcodec-dev (>= 6:10~),
- libavfilter-dev,
- libavformat-dev,
- libavresample-dev,
- libavutil-dev,
- libpostproc-dev,
- libswscale-dev,
- gimp,
- groovy,
- libcommons-lang-java,
- doxygen,
- libcap-dev,
- libsidplay2-dev,
- libdvdnav-dev,
- libdvdread-dev,
- libhdhomerun-dev,
- fontforge,
- fonts-dejavu-core,
- fonts-droid,
- ttf-bitstream-vera
+ kodi-bin
Standards-Version: 3.9.5
Homepage: http://xbmc.org/
Vcs-Git: git://git.debian.org/pkg-multimedia/xbmc.git
@@ -116,273 +12,68 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/xbmc.git
Package: xbmc
Architecture: all
-Depends: xbmc-bin (>= ${source:Version}),
- xbmc-bin (<< ${source:Version}.1~),
- mesa-utils,
- x11-utils,
- fonts-dejavu-core | ttf-dejavu-core,
- fonts-roboto,
- libjs-jquery,
- libjs-iscroll,
- python-imaging,
- ${python:Depends},
- ${misc:Depends}
+Depends: ${misc:Depends}, kodi,
Provides: xbmc-standalone, xbmc-data, xbmc-skin-confluence, xbmc-live
Replaces: xbmc-standalone, xbmc-data, xbmc-skin-confluence, xbmc-live
Breaks: xbmc-standalone (<< 2:11.0~git20111222.22ad8e4),
xbmc-data (<< 2:11.0~git20111222.22ad8e4),
xbmc-skin-confluence (<< 2:11.0~git20111222.22ad8e4)
-Description: XBMC Media Center (arch-independent data package)
- XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
- open source software media-player and entertainment hub for all your digital
- media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
- and Microsoft Windows, as well as the original Xbox game console. Created in
- 2003 by a group of like minded programmers, XBMC is a non-profit project run
- and developed by volunteers located around the world. More than 50 software
- developers have contributed to XBMC, and 100-plus translators have worked to
- expand its reach, making it available in more than 30 languages.
- .
- While XBMC functions very well as a standard media player application for
- your computer, it has been designed to be the perfect companion for your
- HTPC. Supporting an almost endless range of remote controls, and combined
- with its beautiful interface and powerful skinning engine, XBMC feels very
- natural to use from the couch and is the ideal solution for your home
- theater. Once installed, your computer will become a fully functional
- multimedia jukebox.
- .
- This package contains all the architecture independent data needed to have a
- working XBMC.
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
Package: xbmc-bin
Architecture: any
-Depends: ${shlibs:Depends},
- ${dlopenlibs:Depends},
- ${misc:Depends}
-Recommends: ${shlibs:Recommends}
+Depends: ${misc:Depends}, kodi-bin,
Provides: xbmc-common
Replaces: xbmc-common
-Conflicts: xbmc-common, libgl1-mesa-swx11
-Description: XBMC Media Center (binary data package)
- XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
- open source software media-player and entertainment hub for all your digital
- media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
- and Microsoft Windows, as well as the original Xbox game console. Created in
- 2003 by a group of like minded programmers, XBMC is a non-profit project run
- and developed by volunteers located around the world. More than 50 software
- developers have contributed to XBMC, and 100-plus translators have worked to
- expand its reach, making it available in more than 30 languages.
- .
- While XBMC functions very well as a standard media player application for
- your computer, it has been designed to be the perfect companion for your
- HTPC. Supporting an almost endless range of remote controls, and combined
- with its beautiful interface and powerful skinning engine, XBMC feels very
- natural to use from the couch and is the ideal solution for your home
- theater. Once installed, your computer will become a fully functional
- multimedia jukebox.
- .
- This package contains all the binary data needed to have a working XBMC.
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
Package: xbmc-dbg
Priority: extra
Architecture: amd64 i386
-Section: debug
-Depends: ${misc:Depends}, xbmc-bin (= ${binary:Version})
-Description: XBMC Media Center - debug symbols
- XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
- open source software media-player and entertainment hub for all your digital
- media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
- and Microsoft Windows, as well as the original Xbox game console. Created in
- 2003 by a group of like minded programmers, XBMC is a non-profit project run
- and developed by volunteers located around the world. More than 50 software
- developers have contributed to XBMC, and 100-plus translators have worked to
- expand its reach, making it available in more than 30 languages.
- .
- While XBMC functions very well as a standard media player application for
- your computer, it has been designed to be the perfect companion for your
- HTPC. Supporting an almost endless range of remote controls, and combined
- with its beautiful interface and powerful skinning engine, XBMC feels very
- natural to use from the couch and is the ideal solution for your home
- theater. Once installed, your computer will become a fully functional
- multimedia jukebox.
- .
- This package contains debug symbols for the XBMC binary packages.
-
+Depends: ${misc:Depends}, kodi-dbg
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
Package: xbmc-eventclients-common
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
-Description: XBMC Media Center (Event Client Common package)
- XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
- open source software media-player and entertainment hub for all your digital
- media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
- and Microsoft Windows, as well as the original Xbox game console. Created in
- 2003 by a group of like minded programmers, XBMC is a non-profit project run
- and developed by volunteers located around the world. More than 50 software
- developers have contributed to XBMC, and 100-plus translators have worked to
- expand its reach, making it available in more than 30 languages.
- .
- While XBMC functions very well as a standard media player application for
- your computer, it has been designed to be the perfect companion for your
- HTPC. Supporting an almost endless range of remote controls, and combined
- with its beautiful interface and powerful skinning engine, XBMC feels very
- natural to use from the couch and is the ideal solution for your home
- theater. Once installed, your computer will become a fully functional
- multimedia jukebox.
- .
- This package is the common package for XBMC Event Client.
+Depends: ${misc:Depends}, kodi-eventclients-common
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
Package: xbmc-eventclients-dev
Architecture: all
-Section: libdevel
-Depends: xbmc-eventclients-common (= ${binary:Version}),
- ${misc:Depends}
-Description: XBMC Media Center (Event Client Dev package)
- XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
- open source software media-player and entertainment hub for all your digital
- media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
- and Microsoft Windows, as well as the original Xbox game console. Created in
- 2003 by a group of like minded programmers, XBMC is a non-profit project run
- and developed by volunteers located around the world. More than 50 software
- developers have contributed to XBMC, and 100-plus translators have worked to
- expand its reach, making it available in more than 30 languages.
- .
- While XBMC functions very well as a standard media player application for
- your computer, it has been designed to be the perfect companion for your
- HTPC. Supporting an almost endless range of remote controls, and combined
- with its beautiful interface and powerful skinning engine, XBMC feels very
- natural to use from the couch and is the ideal solution for your home
- theater. Once installed, your computer will become a fully functional
- multimedia jukebox.
- .
- This is the Development package for XBMC Event Client.
+Depends: ${misc:Depends}, kodi-eventclients-dev
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
Package: xbmc-eventclients-wiiremote
Architecture: any
-Depends: xbmc-eventclients-common (= ${source:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Description: XBMC Media Center (Event Client WII Remote support package)
- XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
- open source software media-player and entertainment hub for all your digital
- media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
- and Microsoft Windows, as well as the original Xbox game console. Created in
- 2003 by a group of like minded programmers, XBMC is a non-profit project run
- and developed by volunteers located around the world. More than 50 software
- developers have contributed to XBMC, and 100-plus translators have worked to
- expand its reach, making it available in more than 30 languages.
- .
- While XBMC functions very well as a standard media player application for
- your computer, it has been designed to be the perfect companion for your
- HTPC. Supporting an almost endless range of remote controls, and combined
- with its beautiful interface and powerful skinning engine, XBMC feels very
- natural to use from the couch and is the ideal solution for your home
- theater. Once installed, your computer will become a fully functional
- multimedia jukebox.
- .
- This package is the Wii Remote client package for XBMC.
+Depends: ${misc:Depends}, kodi-eventclients-wiiremote
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
Package: xbmc-eventclients-j2me
Architecture: all
-Depends: xbmc-eventclients-common (= ${binary:Version}),
- ${python:Depends},
- python-bluez | python-lightblue,
- ${misc:Depends}
-Description: XBMC Media Center (Event Client J2ME package)
- XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
- open source software media-player and entertainment hub for all your digital
- media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
- and Microsoft Windows, as well as the original Xbox game console. Created in
- 2003 by a group of like minded programmers, XBMC is a non-profit project run
- and developed by volunteers located around the world. More than 50 software
- developers have contributed to XBMC, and 100-plus translators have worked to
- expand its reach, making it available in more than 30 languages.
- .
- While XBMC functions very well as a standard media player application for
- your computer, it has been designed to be the perfect companion for your
- HTPC. Supporting an almost endless range of remote controls, and combined
- with its beautiful interface and powerful skinning engine, XBMC feels very
- natural to use from the couch and is the ideal solution for your home
- theater. Once installed, your computer will become a fully functional
- multimedia jukebox.
- .
- This package is the J2ME package for XBMC Event Client. This is meant to
- provide a server that communicate with a mobile tool supporting Java ME.
+Depends: ${misc:Depends}, kodi-eventclients-j2me
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
Package: xbmc-eventclients-ps3
Architecture: all
-Depends: xbmc-eventclients-common (= ${binary:Version}),
- python-bluez | python-lightblue,
- ${python:Depends},
- ${misc:Depends}
-Description: XBMC Media Center (Event Client PS3 package)
- XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
- open source software media-player and entertainment hub for all your digital
- media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
- and Microsoft Windows, as well as the original Xbox game console. Created in
- 2003 by a group of like minded programmers, XBMC is a non-profit project run
- and developed by volunteers located around the world. More than 50 software
- developers have contributed to XBMC, and 100-plus translators have worked to
- expand its reach, making it available in more than 30 languages.
- .
- While XBMC functions very well as a standard media player application for
- your computer, it has been designed to be the perfect companion for your
- HTPC. Supporting an almost endless range of remote controls, and combined
- with its beautiful interface and powerful skinning engine, XBMC feels very
- natural to use from the couch and is the ideal solution for your home
- theater. Once installed, your computer will become a fully functional
- multimedia jukebox.
- .
- This package is the PS3 package for XBMC Event Client.
+Depends: ${misc:Depends}, kodi-eventclients-ps3
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
Package: xbmc-eventclients-xbmc-send
Architecture: all
-Depends: xbmc-eventclients-common (= ${binary:Version}),
- ${python:Depends},
- ${misc:Depends}
-Description: XBMC Media Center (Event Client XBMC-SEND package)
- XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
- open source software media-player and entertainment hub for all your digital
- media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
- and Microsoft Windows, as well as the original Xbox game console. Created in
- 2003 by a group of like minded programmers, XBMC is a non-profit project run
- and developed by volunteers located around the world. More than 50 software
- developers have contributed to XBMC, and 100-plus translators have worked to
- expand its reach, making it available in more than 30 languages.
- .
- While XBMC functions very well as a standard media player application for
- your computer, it has been designed to be the perfect companion for your
- HTPC. Supporting an almost endless range of remote controls, and combined
- with its beautiful interface and powerful skinning engine, XBMC feels very
- natural to use from the couch and is the ideal solution for your home
- theater. Once installed, your computer will become a fully functional
- multimedia jukebox.
- .
- This package is the XBMC-SEND package for XBMC Event Client.
+Depends: ${misc:Depends}, kodi-eventclients-kodi-send
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
Package: xbmc-addons-dev
Architecture: all
-Section: libdevel
-Depends: ${misc:Depends}
-Description: XBMC Media Center (Addons Dev package)
- XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
- open source software media-player and entertainment hub for all your digital
- media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
- and Microsoft Windows, as well as the original Xbox game console. Created in
- 2003 by a group of like minded programmers, XBMC is a non-profit project run
- and developed by volunteers located around the world. More than 50 software
- developers have contributed to XBMC, and 100-plus translators have worked to
- expand its reach, making it available in more than 30 languages.
- .
- While XBMC functions very well as a standard media player application for
- your computer, it has been designed to be the perfect companion for your
- HTPC. Supporting an almost endless range of remote controls, and combined
- with its beautiful interface and powerful skinning engine, XBMC feels very
- natural to use from the couch and is the ideal solution for your home
- theater. Once installed, your computer will become a fully functional
- multimedia jukebox.
- .
- This is the development package for XBMC Addons.
- .
- This package contains independent headers for building Addons
- without the whole XBMC source tree.
-
+Depends: ${misc:Depends}, kodi-addons-dev
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
diff --git a/debian/mergefonts.ff b/debian/mergefonts.ff
deleted file mode 100755
index c1a43c0..0000000
--- a/debian/mergefonts.ff
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/fontforge
-# merge $1 and $2 to $3 fonts
-Open($1);
-ScaleToEm(2048)
-MergeFonts($2);
-Generate($3);
diff --git a/debian/patches/0001-Don-t-enter-ffmpeg-dir-when-using-external-ffmpeg-li.patch b/debian/patches/0001-Don-t-enter-ffmpeg-dir-when-using-external-ffmpeg-li.patch
deleted file mode 100644
index 21b0e0b..0000000
--- a/debian/patches/0001-Don-t-enter-ffmpeg-dir-when-using-external-ffmpeg-li.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d1c2e454c9a5d7413ae5b6fe05c2c1168baf0f31 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Thu, 6 Mar 2014 13:19:34 +0100
-Subject: [PATCH 1/2] Don't enter ffmpeg dir when using external ffmpeg/libav
-
----
- lib/Makefile.in | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -87,12 +87,14 @@
- endif
-
- ffmpeg:
-+ifneq (@USE_EXTERNAL_FFMPEG@,1)
- $(MAKE) -C $@
- ifeq ($(findstring osx,$(ARCH)), osx)
- -$(AR) d ffmpeg/libavcodec/libavcodec.a log2_tab.o
- -$(AR) d ffmpeg/libavformat/libavformat.a log2_tab.o
- -$(AR) d ffmpeg/libswresample/libswresample.a log2_tab.o
- endif
-+endif
-
- clean:
- rm -f $(addprefix $(SYSDIR)/, $(LIBS))
diff --git a/debian/patches/0002-Fix-compilation-with-libav-10-beta1.patch b/debian/patches/0002-Fix-compilation-with-libav-10-beta1.patch
deleted file mode 100644
index 08aeb2e..0000000
--- a/debian/patches/0002-Fix-compilation-with-libav-10-beta1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bf558f775574b2243f1da21b345e8ae252b500d7 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Thu, 6 Mar 2014 16:37:39 +0100
-Subject: [PATCH 2/2] Fix compilation with libav 10 beta1
-
----
- lib/xbmc-libav-hacks/libav_hacks.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/lib/xbmc-libav-hacks/libav_hacks.h b/lib/xbmc-libav-hacks/libav_hacks.h
-index f81e29e..a315c05 100644
---- a/lib/xbmc-libav-hacks/libav_hacks.h
-+++ b/lib/xbmc-libav-hacks/libav_hacks.h
-@@ -35,6 +35,11 @@
- #error "Your libav version is too old. Please update to libav-10 or git master."
- #endif
-
-+// libavcodec
-+
-+// AVCodecContext does not have pkt_timebase member
-+#define pkt_timebase time_base
-+
- // libavutil
-
- #define AVFRAME_IN_LAVU
---
-1.7.10.4
diff --git a/debian/patches/0004-Disable-static-ffmpeg-when-using-external-ffmpeg-liba.patch b/debian/patches/0004-Disable-static-ffmpeg-when-using-external-ffmpeg-liba.patch
deleted file mode 100644
index b91faa1..0000000
--- a/debian/patches/0004-Disable-static-ffmpeg-when-using-external-ffmpeg-liba.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 5451bad08317e8f36d9541980f773ceeb7262e80 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Fri, 7 Mar 2014 00:17:40 +0100
-Subject: [PATCH] Disble static ffmpeg when using external ffmpeg/libav
-
----
- configure.in | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/configure.in
-+++ b/configure.in
-@@ -876,6 +876,9 @@
- fi
- fi
- fi
-+if test "$use_static_ffmpeg" = "yes" -a "$use_external_ffmpeg" = "yes"; then
-+ use_static_ffmpeg=no
-+fi
- if test "$use_static_ffmpeg" = "yes"; then
- USE_STATIC_FFMPEG=1
- AC_DEFINE([USE_STATIC_FFMPEG], [1], [link ffmpeg statically])
diff --git a/debian/patches/0005-Fix-av_stream_get_r_frame_rate-Libav-hack-accessor.patch b/debian/patches/0005-Fix-av_stream_get_r_frame_rate-Libav-hack-accessor.patch
deleted file mode 100644
index fc3b99c..0000000
--- a/debian/patches/0005-Fix-av_stream_get_r_frame_rate-Libav-hack-accessor.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e7fc1bf22a8ee7e744883eaa0c8f2910d51b4208 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Sun, 30 Mar 2014 14:54:07 +0200
-Subject: [PATCH] Fix av_stream_get_r_frame_rate Libav hack accessor
-
----
- lib/xbmc-libav-hacks/accessors.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/lib/xbmc-libav-hacks/accessors.c b/lib/xbmc-libav-hacks/accessors.c
-index 417bf32..969d576 100644
---- a/lib/xbmc-libav-hacks/accessors.c
-+++ b/lib/xbmc-libav-hacks/accessors.c
-@@ -28,8 +28,5 @@ AVDictionary *av_frame_get_metadata (const AVFrame *frame)
-
- AVRational av_stream_get_r_frame_rate(const AVStream *s)
- {
-- AVRational zero;
-- zero.num = 0;
-- zero.den = 1;
-- return zero;
-+ return s->avg_frame_rate;
- }
---
-1.7.10.4
-
diff --git a/debian/patches/0006-Define-AV_CODEC_ID_SUBRIP-to-AV_CODEC_ID_TEXT-in-lib.patch b/debian/patches/0006-Define-AV_CODEC_ID_SUBRIP-to-AV_CODEC_ID_TEXT-in-lib.patch
deleted file mode 100644
index 7d452b9..0000000
--- a/debian/patches/0006-Define-AV_CODEC_ID_SUBRIP-to-AV_CODEC_ID_TEXT-in-lib.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From bffb887a8d1137b26ca2605734c4c03673a40b42 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Wed, 21 May 2014 23:48:37 +0200
-Subject: [PATCH 2/3] Define AV_CODEC_ID_SUBRIP to AV_CODEC_ID_TEXT in libav
- hacks and fix compilation
-
----
- lib/xbmc-libav-hacks/libav_hacks.h | 2 +-
- xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp | 9 ++++++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
---- a/lib/xbmc-libav-hacks/libav_hacks.h
-+++ b/lib/xbmc-libav-hacks/libav_hacks.h
-@@ -45,7 +45,7 @@
- #define AVFRAME_IN_LAVU
-
- #define AV_CODEC_ID_OTF AV_CODEC_ID_TTF
--#define AV_CODEC_ID_SUBRIP AV_CODEC_ID_FIRST_SUBTITLE
-+#define AV_CODEC_ID_SUBRIP AV_CODEC_ID_TEXT
-
- AVDictionary *av_frame_get_metadata (const AVFrame *frame);
-
---- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
-@@ -386,10 +386,17 @@
- CDVDOverlayCodec* pCodec = NULL;
- CDVDCodecOptions options;
-
-+ // not all FFmpeg versions have AV_CODEC_ID_SUBRIP
-+ // But when they have it, it works like AV_CODEC_ID_TEXT here
-+ if (AV_CODEC_ID_SUBRIP == hint.codec) {
-+ pCodec = OpenCodec(new CDVDOverlayCodecText(), hint, options);
-+ if( pCodec ) return pCodec;
-+ return NULL;
-+ }
-+
- switch (hint.codec)
- {
- case AV_CODEC_ID_TEXT:
-- case AV_CODEC_ID_SUBRIP:
- pCodec = OpenCodec(new CDVDOverlayCodecText(), hint, options);
- if( pCodec ) return pCodec;
- break;
diff --git a/debian/patches/0007-Enable-using-external-ffmpeg-in-.-configure.patch b/debian/patches/0007-Enable-using-external-ffmpeg-in-.-configure.patch
deleted file mode 100644
index 2d82b64..0000000
--- a/debian/patches/0007-Enable-using-external-ffmpeg-in-.-configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From dc85016024fef825a8fffcd9881a7a0bd86912af Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Fri, 16 May 2014 12:07:51 +0200
-Subject: [PATCH] Enable using external ffmpeg in ./configure
-
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/configure.in
-+++ b/configure.in
-@@ -602,7 +602,7 @@
- READELF="${READELF:-readelf}"
- NM="${NM:-nm}"
-
--use_external_ffmpeg=no
-+use_external_ffmpeg=yes
- use_static_ffmpeg=no
-
- # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
diff --git a/debian/patches/0008-Setup-AVVDPAUContext-with-API-calls-instead-of-using.patch b/debian/patches/0008-Setup-AVVDPAUContext-with-API-calls-instead-of-using.patch
deleted file mode 100644
index 3fa4d9e..0000000
--- a/debian/patches/0008-Setup-AVVDPAUContext-with-API-calls-instead-of-using.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 5c0cf96c60f8545b3bc7118f2e0060a908b63b7a Mon Sep 17 00:00:00 2001
-From: Anton Khirnov <anton at khirnov.net>
-Date: Sat, 4 Oct 2014 21:32:35 +0200
-Subject: [PATCH] Setup AVVDPAUContext with API calls instead of using memset()
-Origin: https://bugzilla.libav.org/show_bug.cgi?id=674
----
- lib/xbmc-libav-hacks/libav_hacks.h | 7 +++++++
- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 22 +++++++++-------------
- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h | 2 +-
- 3 files changed, 17 insertions(+), 14 deletions(-)
-
-diff --git a/lib/xbmc-libav-hacks/libav_hacks.h b/lib/xbmc-libav-hacks/libav_hacks.h
-index af64980..a840b31 100644
---- a/lib/xbmc-libav-hacks/libav_hacks.h
-+++ b/lib/xbmc-libav-hacks/libav_hacks.h
-@@ -21,11 +21,18 @@
- #ifndef __LIBAV_HACKS_H
- #define __LIBAV_HACKS_H
-
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- #include <libavutil/avutil.h>
- #include <libavutil/opt.h>
- #include <libavresample/avresample.h>
- #include <libavformat/avformat.h>
- #include <libavfilter/avfilter.h>
-+#include <libavcodec/vdpau.h>
-+#ifdef __cplusplus
-+}
-+#endif
-
- #if LIBAVUTIL_VERSION_MICRO >= 100
- #error "You should not enable libav hacks when building against FFmpeg."
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-index 73c4fa4..932985a 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-@@ -488,7 +488,7 @@ CDecoder::CDecoder() : m_vdpauOutput(&m_inMsgEvent)
- m_vdpauConfig.videoSurfaces = &m_videoSurfaces;
-
- m_vdpauConfigured = false;
-- m_hwContext.bitstream_buffers_allocated = 0;
-+ m_hwContext = av_vdpau_alloc_context();
- m_DisplayState = VDPAU_OPEN;
- m_vdpauConfig.context = 0;
- }
-@@ -578,17 +578,16 @@ bool CDecoder::Open(AVCodecContext* avctx, const enum PixelFormat fmt, unsigned
-
- m_vdpauConfig.context->GetProcs().vdp_decoder_destroy(m_vdpauConfig.vdpDecoder);
- CheckStatus(vdp_st, __LINE__);
-+ if (!ConfigVDPAU(avctx, 16))
-+ return false;
-
- // finally setup ffmpeg
-- memset(&m_hwContext, 0, sizeof(AVVDPAUContext));
-- m_hwContext.render = CDecoder::Render;
-- m_hwContext.bitstream_buffers_allocated = 0;
-+ m_hwContext->render = m_vdpauConfig.context->GetProcs().vdp_decoder_render;
-+ m_hwContext->decoder = m_vdpauConfig.vdpDecoder;
- avctx->get_buffer = CDecoder::FFGetBuffer;
- avctx->reget_buffer = CDecoder::FFGetBuffer;
- avctx->release_buffer = CDecoder::FFReleaseBuffer;
-- avctx->draw_horiz_band = CDecoder::FFDrawSlice;
-- avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
-- avctx->hwaccel_context = &m_hwContext;
-+ avctx->hwaccel_context = m_hwContext;
-
- g_Windowing.Register(this);
- return true;
-@@ -613,11 +612,7 @@ void CDecoder::Close()
- FiniVDPAUOutput();
- m_vdpauOutput.Dispose();
-
-- if (m_hwContext.bitstream_buffers_allocated)
-- {
-- m_dllAvUtil.av_freep(&m_hwContext.bitstream_buffers);
-- }
--
-+ av_freep(&m_hwContext);
- m_dllAvUtil.Unload();
-
- if (m_vdpauConfig.context)
-@@ -1030,6 +1025,7 @@ VdpStatus CDecoder::Render( VdpDecoder decoder, VdpVideoSurface target,
- return VDP_STATUS_OK;
- }
-
-+#if 0
- void CDecoder::FFDrawSlice(struct AVCodecContext *s,
- const AVFrame *src, int offset[4],
- int y, int type, int height)
-@@ -1089,7 +1085,7 @@ void CDecoder::FFDrawSlice(struct AVCodecContext *s,
- if (diff*1000/CurrentHostFrequency() > 30)
- CLog::Log(LOGDEBUG, "CVDPAU::DrawSlice - VdpDecoderRender long decoding: %d ms, dec: %d, proc: %d, rend: %d", (int)((diff*1000)/CurrentHostFrequency()), decoded, processed, rend);
- }
--
-+#endif
-
- int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame)
- {
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-index ccad9a6..dc3956a 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-@@ -619,7 +619,7 @@ protected:
- bool m_vdpauConfigured;
- CVdpauConfig m_vdpauConfig;
- CVideoSurfaces m_videoSurfaces;
-- AVVDPAUContext m_hwContext;
-+ AVVDPAUContext *m_hwContext;
-
- COutput m_vdpauOutput;
- CVdpauBufferStats m_bufferStats;
---
-2.1.1
-
diff --git a/debian/patches/0009-Use-VDPAU-in-Libav-hacks-only-when-VDPAU-support-is-.patch b/debian/patches/0009-Use-VDPAU-in-Libav-hacks-only-when-VDPAU-support-is-.patch
deleted file mode 100644
index 778cdc6..0000000
--- a/debian/patches/0009-Use-VDPAU-in-Libav-hacks-only-when-VDPAU-support-is-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dccd6d3bec1ce8f13f771f5d21b7413f8b465836 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Wed, 8 Oct 2014 15:17:17 +0200
-Subject: [PATCH] Use VDPAU in Libav hacks only when VDPAU support is enabled
-
----
- lib/xbmc-libav-hacks/libav_hacks.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/xbmc-libav-hacks/libav_hacks.h b/lib/xbmc-libav-hacks/libav_hacks.h
-index a840b31..a193ecf 100644
---- a/lib/xbmc-libav-hacks/libav_hacks.h
-+++ b/lib/xbmc-libav-hacks/libav_hacks.h
-@@ -29,7 +29,9 @@ extern "C" {
- #include <libavresample/avresample.h>
- #include <libavformat/avformat.h>
- #include <libavfilter/avfilter.h>
-+#ifdef HAVE_LIBVDPAU
- #include <libavcodec/vdpau.h>
-+#endif
- #ifdef __cplusplus
- }
- #endif
---
-2.1.1
-
diff --git a/debian/patches/0011-mips-add-guards.patch b/debian/patches/0011-mips-add-guards.patch
deleted file mode 100644
index 8f499c6..0000000
--- a/debian/patches/0011-mips-add-guards.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From b82da322de1ebbadcc2b3bbb77a9599c28d7b745 Mon Sep 17 00:00:00 2001
-From: theuni <theuni-nospam- at xbmc.org>
-Date: Fri, 30 Sep 2011 06:16:18 -0400
-Subject: [PATCH 1/4] mips: add guards
-
-Updated for 13.2 by Balint Reczey
----
- Makefile.in | 2 +-
- xbmc/cores/DllLoader/DllLoader.h | 2 +-
- xbmc/cores/DllLoader/ldt_keeper.c | 2 +-
- xbmc/linux/PlatformDefs.h | 2 +-
- xbmc/utils/fastmemcpy.c | 2 +-
- xbmc/utils/fastmemcpy.h | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 6c55e67..1bb69ba 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -432,7 +432,7 @@ ifeq (@USE_ASAP_CODEC@,1)
- endif
- endif
- $(MAKE) -C lib/stsound/StSoundLibrary
--ifeq ($(or $(findstring powerpc, at ARCH@),$(findstring x86_64-linux, at ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd, at ARCH@)),)
-+ifeq ($(or $(findstring powerpc, at ARCH@),$(findstring x86_64-linux, at ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd, at ARCH@),$(findstring mips, at ARCH@)),)
- $(MAKE) -C lib/snesapu/SNES/SNESAPU
- endif
- imagelib: dllloader
-diff --git a/xbmc/cores/DllLoader/DllLoader.h b/xbmc/cores/DllLoader/DllLoader.h
-index 7109ea7..864c5b2 100644
---- a/xbmc/cores/DllLoader/DllLoader.h
-+++ b/xbmc/cores/DllLoader/DllLoader.h
-@@ -23,7 +23,7 @@
- #include "coffldr.h"
- #include "LibraryLoader.h"
-
--#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__)
-+#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__mips__)
- #define USE_LDT_KEEPER
- #include "ldt_keeper.h"
- #endif
-diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c
-index 91c7a22..8af9a86 100644
---- a/xbmc/cores/DllLoader/ldt_keeper.c
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c
-@@ -19,7 +19,7 @@
- */
-
- //#ifndef __powerpc__
--#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__)
-+#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__mips__)
-
- #include "ldt_keeper.h"
-
-diff --git a/xbmc/linux/PlatformDefs.h b/xbmc/linux/PlatformDefs.h
-index 1686961..4350075 100644
---- a/xbmc/linux/PlatformDefs.h
-+++ b/xbmc/linux/PlatformDefs.h
-@@ -161,7 +161,7 @@
- #define __int64 long long
- #define __uint64 unsigned long long
-
--#if defined(__x86_64__) || defined(__powerpc__) || defined(__ppc__) || defined (__arm__) // should this be powerpc64 only?
-+#if defined(__x86_64__) || defined(__powerpc__) || defined(__ppc__) || defined (__arm__) || defined(__mips__) // should this be powerpc64 only?
- #define __stdcall
- #else /* !__x86_64__ */
- #define __stdcall __attribute__((__stdcall__))
-diff --git a/xbmc/utils/fastmemcpy.c b/xbmc/utils/fastmemcpy.c
-index d2a1d49..ec9019a 100644
---- a/xbmc/utils/fastmemcpy.c
-+++ b/xbmc/utils/fastmemcpy.c
-@@ -25,7 +25,7 @@
- * <http://www.gnu.org/licenses/>.
- *
- */
--#if !defined(TARGET_WINDOWS) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__)
-+#if !defined(TARGET_WINDOWS) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__mips__)
- #define HAVE_MMX2
- #define HAVE_SSE
-
-diff --git a/xbmc/utils/fastmemcpy.h b/xbmc/utils/fastmemcpy.h
-index ce78d49..43f5904 100644
---- a/xbmc/utils/fastmemcpy.h
-+++ b/xbmc/utils/fastmemcpy.h
-@@ -23,7 +23,7 @@
- extern "C" {
- #endif
-
--#if !defined(TARGET_WINDOWS) && !defined(__ppc__) && !defined(__powerpc__) && !defined(TARGET_ANDROID) && !defined(TARGET_DARWIN_IOS)
-+#if !defined(TARGET_WINDOWS) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(TARGET_ANDROID) && !defined(TARGET_DARWIN_IOS)
- void * fast_memcpy(void * to, const void * from, size_t len);
- //#define fast_memcpy memcpy
- #else
---
-2.1.1
-
diff --git a/debian/patches/0012-mips-add-atomics.patch b/debian/patches/0012-mips-add-atomics.patch
deleted file mode 100644
index 90836da..0000000
--- a/debian/patches/0012-mips-add-atomics.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-From 3bb261a18c9d9f7220351007db51e97c0cfdd6d9 Mon Sep 17 00:00:00 2001
-From: theuni <theuni-nospam- at xbmc.org>
-Date: Fri, 30 Sep 2011 06:17:00 -0400
-Subject: [PATCH 2/4] mips: add atomics
-
-Most taken from the Linux kernel.
-
-Updated for 13.2 by Balint Reczey
----
- xbmc/threads/Atomics.cpp | 35 ++++++--------
- xbmc/threads/MipsAtomics.h | 115 +++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 130 insertions(+), 20 deletions(-)
- create mode 100644 xbmc/threads/MipsAtomics.h
-
-diff --git a/xbmc/threads/Atomics.cpp b/xbmc/threads/Atomics.cpp
-index 12d3e56..ca5d981 100644
---- a/xbmc/threads/Atomics.cpp
-+++ b/xbmc/threads/Atomics.cpp
-@@ -20,6 +20,12 @@
-
- #include "Atomics.h"
- #include "system.h"
-+
-+#if defined(__mips__)
-+#include "MipsAtomics.h"
-+pthread_mutex_t cmpxchg_mutex = PTHREAD_MUTEX_INITIALIZER;
-+#endif
-+
- ///////////////////////////////////////////////////////////////////////////
- // 32-bit atomic compare-and-swap
- // Returns previous value of *pAddr
-@@ -63,10 +69,7 @@ long cas(volatile long *pAddr, long expectedVal, long swapVal)
- return prev;
-
- #elif defined(__mips__)
--// TODO:
-- unsigned int prev;
-- #error atomic cas undefined for mips
-- return prev;
-+ return cmpxchg32(pAddr, expectedVal, swapVal);
-
- #elif defined(TARGET_WINDOWS)
- long prev;
-@@ -103,11 +106,14 @@ long cas(volatile long *pAddr, long expectedVal, long swapVal)
- ///////////////////////////////////////////////////////////////////////////
- long long cas2(volatile long long* pAddr, long long expectedVal, long long swapVal)
- {
--#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__mips__) // PowerPC, ARM, and MIPS
-+#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__)// PowerPC and ARM
- // Not available/required
- // Hack to allow compilation
- throw "cas2 is not implemented";
-
-+#elif defined(__mips__)
-+ return cmpxchg64(pAddr, expectedVal, swapVal);
-+
- #elif defined(TARGET_WINDOWS)
- long long prev;
- __asm
-@@ -183,10 +189,7 @@ long AtomicIncrement(volatile long* pAddr)
- return val;
-
- #elif defined(__mips__)
--// TODO:
-- long val;
-- #error AtomicIncrement undefined for mips
-- return val;
-+ return atomic_add(1, pAddr);
-
- #elif defined(TARGET_WINDOWS)
- long val;
-@@ -261,10 +264,7 @@ long AtomicAdd(volatile long* pAddr, long amount)
- return val;
-
- #elif defined(__mips__)
--// TODO:
-- long val;
-- #error AtomicAdd undefined for mips
-- return val;
-+ return atomic_add(amount, pAddr);
-
- #elif defined(TARGET_WINDOWS)
- __asm
-@@ -339,10 +339,7 @@ long AtomicDecrement(volatile long* pAddr)
- return val;
-
- #elif defined(__mips__)
--// TODO:
-- long val;
-- #error AtomicDecrement undefined for mips
-- return val;
-+ return atomic_sub(1, pAddr);
-
- #elif defined(TARGET_WINDOWS)
- long val;
-@@ -418,9 +415,7 @@ long AtomicSubtract(volatile long* pAddr, long amount)
- return val;
-
- #elif defined(__mips__)
--// TODO:
-- #error AtomicSubtract undefined for mips
-- return val;
-+ return atomic_sub(amount, pAddr);
-
- #elif defined(TARGET_WINDOWS)
- amount *= -1;
-diff --git a/xbmc/threads/MipsAtomics.h b/xbmc/threads/MipsAtomics.h
-new file mode 100644
-index 0000000..8ff69b6
---- /dev/null
-+++ b/xbmc/threads/MipsAtomics.h
-@@ -0,0 +1,115 @@
-+/*
-+ * Copyright (C) 2005-2011 Team XBMC
-+ * http://www.xbmc.org
-+ *
-+ * 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 XBMC; see the file COPYING. If not, write to
-+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * http://www.gnu.org/copyleft/gpl.html
-+ *
-+ * Copyright (C) 2003, 06, 07 by Ralf Baechle (ralf at linux-mips.org)
-+ *
-+ * Most of this file was borrowed from the linux kernel.
-+ */
-+
-+#ifndef __ATOMIC_MIPS_H_
-+#define __ATOMIC_MIPS_H_
-+
-+#include <inttypes.h>
-+#include <pthread.h>
-+
-+extern pthread_mutex_t cmpxchg_mutex;
-+
-+static inline long cmpxchg32(volatile long *m, long oldval, long newval)
-+{
-+ long retval;
-+ __asm__ __volatile__( \
-+ " .set push \n" \
-+ " .set noat \n" \
-+ " .set mips3 \n" \
-+ "1: ll %0, %2 # __cmpxchg_asm \n" \
-+ " bne %0, %z3, 2f \n" \
-+ " .set mips0 \n" \
-+ " move $1, %z4 \n" \
-+ " .set mips3 \n" \
-+ " sc $1, %1 \n" \
-+ " beqz $1, 3f \n" \
-+ "2: \n" \
-+ " .subsection 2 \n" \
-+ "3: b 1b \n" \
-+ " .previous \n" \
-+ " .set pop \n" \
-+ : "=&r" (retval), "=R" (*m) \
-+ : "R" (*m), "Jr" (oldval), "Jr" (newval) \
-+ : "memory"); \
-+
-+ return retval;
-+}
-+
-+
-+static inline long long cmpxchg64(volatile long long *ptr,
-+ long long oldval, long long newval)
-+{
-+ long long prev;
-+
-+ pthread_mutex_lock(&cmpxchg_mutex);
-+ prev = *(long long *)ptr;
-+ if (prev == oldval)
-+ *(long long *)ptr = newval;
-+ pthread_mutex_unlock(&cmpxchg_mutex);
-+ return prev;
-+}
-+
-+
-+static __inline__ long atomic_add(int i, volatile long* v)
-+{
-+ long temp;
-+
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %0, %1 # atomic_add \n"
-+ " addu %0, %2 \n"
-+ " sc %0, %1 \n"
-+ " beqz %0, 2f \n"
-+ " .subsection 2 \n"
-+ "2: b 1b \n"
-+ " .previous \n"
-+ " .set mips0 \n"
-+ : "=&r" (temp), "=m" (*v)
-+ : "Ir" (i), "m" (*v));
-+
-+ return temp;
-+}
-+
-+static __inline__ long atomic_sub(int i, volatile long* v)
-+{
-+ long temp;
-+
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %0, %1 # atomic_sub \n"
-+ " subu %0, %2 \n"
-+ " sc %0, %1 \n"
-+ " beqz %0, 2f \n"
-+ " .subsection 2 \n"
-+ "2: b 1b \n"
-+ " .previous \n"
-+ " .set mips0 \n"
-+ : "=&r" (temp), "=m" (*v)
-+ : "Ir" (i), "m" (*v));
-+
-+ return temp;
-+}
-+
-+
-+#endif
---
-2.1.1
-
diff --git a/debian/patches/0013-mips-Add-configure-option-for-mips-and-mipsel.patch b/debian/patches/0013-mips-Add-configure-option-for-mips-and-mipsel.patch
deleted file mode 100644
index 4e226a7..0000000
--- a/debian/patches/0013-mips-Add-configure-option-for-mips-and-mipsel.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From fef995c74fc6719bce4b8c523ade6f589129a05a Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Fri, 30 Sep 2011 06:22:51 -0400
-Subject: [PATCH 3/4] mips: Add configure option for mips and mipsel
-
----
- configure.in | 10 ++++++++++
- m4/xbmc_arch.m4 | 3 +++
- 2 files changed, 13 insertions(+)
-
-diff --git a/configure.in b/configure.in
-index 2e49fa1..186edfe 100644
---- a/configure.in
-+++ b/configure.in
-@@ -715,6 +715,16 @@ case $host in
- use_wayland=no
- build_shared_lib=yes
- ;;
-+ mips*-*-linux-gnu*)
-+ ARCH="mips"
-+ use_arch="mips"
-+ ffmpeg_target_os=linux
-+ use_joystick=no
-+ use_gles=no
-+ use_sdl=yes
-+ use_x11=yes
-+ use_wayland=no
-+ ;;
- *)
- AC_MSG_ERROR(unsupported host ($host))
- esac
-diff --git a/m4/xbmc_arch.m4 b/m4/xbmc_arch.m4
-index 5bcdd81..f9ab5cd 100644
---- a/m4/xbmc_arch.m4
-+++ b/m4/xbmc_arch.m4
-@@ -32,6 +32,9 @@ case $host in
- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
- AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
- ;;
-+ mips*-*-linux-gnu*|mips*-*-linux-uclibc*)
-+ AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
-+ ;;
- *-*linux-android*)
- AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_ANDROID")
- ;;
---
-2.1.1
-
diff --git a/debian/patches/0014-mips-Don-t-use-ASM-round-and-truncate-on-MIPS.patch b/debian/patches/0014-mips-Don-t-use-ASM-round-and-truncate-on-MIPS.patch
deleted file mode 100644
index e8cb847..0000000
--- a/debian/patches/0014-mips-Don-t-use-ASM-round-and-truncate-on-MIPS.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7f6a9770ea9a669294847b3b03eadf07ebe7a896 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balitreczey.hu>
-Date: Mon, 13 Oct 2014 17:10:40 +0100
-Subject: [PATCH 4/4] mips: Don't use ASM round and truncate on MIPS
-
----
- xbmc/utils/MathUtils.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
-index 96af9f4..b8ba6cc 100644
---- a/xbmc/utils/MathUtils.h
-+++ b/xbmc/utils/MathUtils.h
-@@ -34,6 +34,7 @@
-
- #if defined(__ppc__) || \
- defined(__powerpc__) || \
-+ defined(__mips__) || \
- (defined(TARGET_DARWIN_IOS) && defined(__llvm__)) || \
- (defined(TARGET_ANDROID) && defined(__arm__)) || \
- defined(TARGET_RASPBERRY_PI)
-@@ -42,6 +43,7 @@
-
- #if defined(__ppc__) || \
- defined(__powerpc__) || \
-+ defined(__mips__) || \
- (defined(TARGET_DARWIN) && defined(__llvm__)) || \
- (defined(TARGET_ANDROID) && defined(__arm__)) || \
- defined(TARGET_RASPBERRY_PI)
---
-2.1.1
-
diff --git a/debian/patches/0016-mips-Fix-build-with-using-OpenGL-rendering.patch b/debian/patches/0016-mips-Fix-build-with-using-OpenGL-rendering.patch
deleted file mode 100644
index 07f563c..0000000
--- a/debian/patches/0016-mips-Fix-build-with-using-OpenGL-rendering.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9ca099cfbd12d496f19a1b7dfb068a07b0379c71 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Mon, 20 Oct 2014 17:01:51 +0200
-Subject: [PATCH] mips: Fix build with using OpenGL rendering
-
----
- xbmc/cores/VideoRenderers/LinuxRendererGL.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.h b/xbmc/cores/VideoRenderers/LinuxRendererGL.h
-index 63ea287..d80be59 100644
---- a/xbmc/cores/VideoRenderers/LinuxRendererGL.h
-+++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.h
-@@ -330,7 +330,7 @@ protected:
-
-
- inline int NP2( unsigned x ) {
--#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__)
-+#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__mips__)
- // If there are any issues compiling this, just append a ' && 0'
- // to the above to make it '#if defined(TARGET_POSIX) && 0'
-
---
-2.1.1
-
diff --git a/debian/patches/0017-libav-Fix-uninitialized-read.patch b/debian/patches/0017-libav-Fix-uninitialized-read.patch
deleted file mode 100644
index 968151e..0000000
--- a/debian/patches/0017-libav-Fix-uninitialized-read.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 414522d5049a230e71a2c2fef45a6b525d6a9803 Mon Sep 17 00:00:00 2001
-From: Anton Khirnov <anton at khirnov.net>
-Date: Sun, 26 Oct 2014 18:29:48 +0100
-Subject: [PATCH] Fix uninitialized read.
-
----
- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-index 932985a..9d90a9c 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-@@ -1095,9 +1095,6 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame)
-
- CSingleLock lock(m_DecoderSection);
-
-- if (m_DecoderError && pFrame)
-- return VC_ERROR;
--
- if (!m_vdpauConfigured)
- return VC_ERROR;
-
---
-2.0.0.rc2
-
diff --git a/debian/patches/0018-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch b/debian/patches/0018-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch
deleted file mode 100644
index 5da71ad..0000000
--- a/debian/patches/0018-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c6ae8568b99785465d1461c8878cdee08ff44eae Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Tue, 4 Nov 2014 00:13:21 +0100
-Subject: [PATCH] linux: Check for Logind first, then *Kit-s with UPower when
- detecting PM framework
-
-Logind is the most likely candidate to work nowadays and latest UPower does
-not provide suspend/hibernate API.
----
- xbmc/powermanagement/PowerManager.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/xbmc/powermanagement/PowerManager.cpp
-+++ b/xbmc/powermanagement/PowerManager.cpp
-@@ -78,12 +78,12 @@
- m_instance = new CAndroidPowerSyscall();
- #elif defined(TARGET_POSIX)
- #if defined(HAS_DBUS)
-- if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
-+ if (CLogindUPowerSyscall::HasLogind())
-+ m_instance = new CLogindUPowerSyscall();
-+ else if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
- m_instance = new CConsoleUPowerSyscall();
- else if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit())
- m_instance = new CConsoleDeviceKitPowerSyscall();
-- else if (CLogindUPowerSyscall::HasLogind())
-- m_instance = new CLogindUPowerSyscall();
- else if (CUPowerSyscall::HasUPower())
- m_instance = new CUPowerSyscall();
- #if defined(HAS_HAL)
diff --git a/debian/patches/0019-Fix-bashisms-in-shell-scripts.patch b/debian/patches/0019-Fix-bashisms-in-shell-scripts.patch
deleted file mode 100644
index b58b465..0000000
--- a/debian/patches/0019-Fix-bashisms-in-shell-scripts.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e0fa3f413bf56670c7fe2185f4d2c998cbf73647 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Sat, 6 Dec 2014 17:29:18 +0100
-Subject: [PATCH] Fix bashisms in shell scripts
-
-Bashisms in scripts may cause problems on systems where the default
-shell is not Bash.
-
-diff --git a/tools/Linux/xbmc.sh.in b/tools/Linux/xbmc.sh.in
-index db99670..d80392c 100644
---- a/tools/Linux/xbmc.sh.in
-+++ b/tools/Linux/xbmc.sh.in
-@@ -78,8 +78,8 @@ print_crash_report()
- echo >> $FILE
- echo "############### STACK TRACE #################" >> $FILE
- if which gdb >/dev/null 2>&1; then
-- if which systemd-coredumpctl &> /dev/null; then
-- systemd-coredumpctl dump -o core xbmc.bin &> /dev/null
-+ if which systemd-coredumpctl > /dev/null 2>&1; then
-+ systemd-coredumpctl dump -o core xbmc.bin > /dev/null 2>&1
- fi
- single_stacktrace "$PWD" 1
- # Find in plugins directories
diff --git a/debian/patches/03-privacy.patch b/debian/patches/03-privacy.patch
deleted file mode 100644
index a3a0881..0000000
--- a/debian/patches/03-privacy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/system/settings/settings.xml b/system/settings/settings.xml
-index f92bd59..a856784 100644
---- a/system/settings/settings.xml
-+++ b/system/settings/settings.xml
-@@ -92,7 +92,7 @@
- <group id="2">
- <setting id="lookandfeel.enablerssfeeds" type="boolean" label="13305" help="36111">
- <level>1</level>
-- <default>true</default>
-+ <default>false</default>
- <control type="toggle" />
- </setting>
- <setting id="lookandfeel.rssedit" type="string" parent="lookandfeel.enablerssfeeds" label="21450" help="36112">
diff --git a/debian/patches/04-differentiate-from-vanilla-XBMC.patch b/debian/patches/04-differentiate-from-vanilla-XBMC.patch
deleted file mode 100644
index a032937..0000000
--- a/debian/patches/04-differentiate-from-vanilla-XBMC.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/addons/skin.confluence/720p/Home.xml
-+++ b/addons/skin.confluence/720p/Home.xml
-@@ -19,7 +19,7 @@
- <description>LOGO</description>
- <left>0</left>
- <top>5</top>
-- <width>170</width>
-+ <width>680</width>
- <height>100</height>
- <aspectratio aligny="top" align="left">keep</aspectratio>
- <texture>xbmc-logo.png</texture>
---- a/addons/skin.confluence/720p/LoginScreen.xml
-+++ b/addons/skin.confluence/720p/LoginScreen.xml
-@@ -24,7 +24,7 @@
- <description>LOGO</description>
- <left>0</left>
- <top>5</top>
-- <width>170</width>
-+ <width>680</width>
- <height>100</height>
- <aspectratio aligny="top" align="left">keep</aspectratio>
- <texture>xbmc-logo.png</texture>
---- a/xbmc/Application.cpp
-+++ b/xbmc/Application.cpp
-@@ -691,7 +691,7 @@
- CProfilesManager::Get().Load();
-
- CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------");
-- CLog::Log(LOGNOTICE, "Starting XBMC (%s). Platform: %s %s %d-bit", g_infoManager.GetVersion().c_str(), g_sysinfo.GetBuildTargetCpuFamily().c_str(),
-+ CLog::Log(LOGNOTICE, "Starting XBMC from Debian (%s). Platform: %s %s %d-bit", g_infoManager.GetVersion().c_str(), g_sysinfo.GetBuildTargetCpuFamily().c_str(),
- g_sysinfo.GetBuildTargetPlatformName().c_str(), g_sysinfo.GetXbmcBitness());
-
- /* Expand macro before stringify */
---- a/xbmc/GUIInfoManager.cpp
-+++ b/xbmc/GUIInfoManager.cpp
-@@ -4208,7 +4208,7 @@
- if (GetXbmcGitRevision())
- tmp = StringUtils::Format("%d.%d%s Git:%s", VERSION_MAJOR, VERSION_MINOR, VERSION_TAG, GetXbmcGitRevision());
- else
-- tmp = StringUtils::Format("%d.%d%s", VERSION_MAJOR, VERSION_MINOR, VERSION_TAG);
-+ tmp = StringUtils::Format("%d.%d%s Debian package version:%s", VERSION_MAJOR, VERSION_MINOR, VERSION_TAG, DEB_VERSION);
- return tmp;
- }
-
---- a/xbmc/GitRevision.cpp
-+++ b/xbmc/GitRevision.cpp
-@@ -29,7 +29,7 @@
- const char *GetXbmcGitRevision()
- {
- #ifdef GIT_REV
-- return GIT_REV;
-+ return NULL;
- #else
- return NULL;
- #endif
diff --git a/debian/patches/05-Fix-GLES-with-X11.patch b/debian/patches/05-Fix-GLES-with-X11.patch
deleted file mode 100644
index 9ed8976..0000000
--- a/debian/patches/05-Fix-GLES-with-X11.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Chris Browet <koying at semperpax.com>
-Date: Sat, 28 Dec 2013 13:35:48 +0100
-Subject: [PATCH] Fix GLES on X11
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The patch is from http://forum.odroid.com/viewtopic.php?f=54&t=1244&p=7887#p7875 .
-Tested by Олег Капустин <olegvedi at gmail.com>.
----
- xbmc/windowing/X11/WinSystemX11GLES.cpp | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/xbmc/windowing/X11/WinSystemX11GLES.cpp b/xbmc/windowing/X11/WinSystemX11GLES.cpp
-index 3d82fbf..cef19a0 100644
---- a/xbmc/windowing/X11/WinSystemX11GLES.cpp
-+++ b/xbmc/windowing/X11/WinSystemX11GLES.cpp
-@@ -144,11 +144,8 @@ bool CWinSystemX11GLES::DestroyWindowSystem()
- m_eglDisplay = 0;
- }
-
-- if (m_dpy)
-- {
-- XCloseDisplay(m_dpy);
-- m_dpy = NULL;
-- }
-+ //we don't call XCloseDisplay() here, since ati keeps a pointer to our m_dpy
-+ //so instead we just let m_dpy die on exit
-
- return true;
- }
-@@ -158,11 +155,12 @@ bool CWinSystemX11GLES::CreateNewWindow(const CStdString& name, bool fullScreen,
- if(!SetFullScreen(fullScreen, res, false))
- return false;
-
-- CTexture iconTexture;
-- iconTexture.LoadFromFile("special://xbmc/media/icon256x256.png");
-+ CBaseTexture* iconTexture = CTexture::LoadFromFile("special://xbmc/media/icon256x256.png");
-
-- SDL_WM_SetIcon(SDL_CreateRGBSurfaceFrom(iconTexture.GetPixels(), iconTexture.GetWidth(), iconTexture.GetHeight(), BPP, iconTexture.GetPitch(), 0xff0000, 0x00ff00, 0x0000ff, 0xff000000L), NULL);
-+ if (iconTexture)
-+ SDL_WM_SetIcon(SDL_CreateRGBSurfaceFrom(iconTexture->GetPixels(), iconTexture->GetWidth(), iconTexture->GetHeight(), 32, iconTexture->GetPitch(), 0xff0000, 0x00ff00, 0x0000ff, 0xff000000L), NULL);
- SDL_WM_SetCaption("XBMC Media Center", NULL);
-+ delete iconTexture;
-
- m_bWindowCreated = true;
-
---
-1.7.10.4
-
diff --git a/debian/patches/06-use-external-libraries.patch b/debian/patches/06-use-external-libraries.patch
deleted file mode 100644
index 9252542..0000000
--- a/debian/patches/06-use-external-libraries.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-Description: Use system's libraries instead of the embedded ones
- .
-Author: Balint Reczey <balint at balintreczey.hu>
-Forwarded: not-needed
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -194,7 +194,6 @@
- PAPCODECS_DIRS= \
- lib/nosefart \
- lib/timidity \
-- lib/libsidplay2 \
- lib/stsound/StSoundLibrary \
- lib/snesapu/SNES/SNESAPU \
- lib/vgmstream
-@@ -207,7 +206,6 @@
- LIB_DIRS=\
- lib/cximage-6.0 \
- lib/libexif \
-- lib/libhdhomerun \
- lib/cpluff \
- lib/xbmc-dll-symbols
-
-@@ -424,7 +422,7 @@
- $(MAKE) -C lib/timidity
- $(MAKE) -C lib/nosefart
- ifneq ($(findstring arm-osx, at ARCH@), arm-osx)
-- $(MAKE) -C lib/libsidplay2
-+# $(MAKE) -C lib/libsidplay2
- endif
- ifeq (@USE_ASAP_CODEC@,1)
- ifneq ($(findstring osx, at ARCH@), osx)
-@@ -445,7 +443,7 @@
-
- codecs: papcodecs dvdpcodecs dvdpextcodecs
-
--libs: libhdhomerun imagelib libexif system/libcpluff- at ARCH@.so $(CMYTH)
-+libs: imagelib libexif system/libcpluff- at ARCH@.so $(CMYTH)
-
- externals: codecs libs visualizations screensavers libaddon pvraddons
-
---- a/bootstrap.mk
-+++ b/bootstrap.mk
-@@ -2,7 +2,7 @@
- BOOTSTRAP_SUBDIRS += xbmc/screensavers/rsxs-0.9/configure.ac
- BOOTSTRAP_SUBDIRS += xbmc/visualizations/Goom/goom2k4-0/configure.in
- BOOTSTRAP_SUBDIRS += lib/cpluff/configure.ac
--BOOTSTRAP_SUBDIRS += lib/gtest/configure.ac
-+#BOOTSTRAP_SUBDIRS += lib/gtest/configure.ac
-
- ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),)
- BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
---- a/configure.in
-+++ b/configure.in
-@@ -1206,6 +1206,12 @@
- PKG_CHECK_MODULES([TAGLIB], [taglib >= 1.8],
- [INCLUDES="$INCLUDES $TAGLIB_CFLAGS"; LIBS="$LIBS $TAGLIB_LIBS"],
- AC_MSG_ERROR($missing_library))
-+PKG_CHECK_MODULES([SIDPLAY], [libsidplay2],
-+ [INCLUDES="$INCLUDES $SIDPLAY_CFLAGS"; LIBS="$LIBS $SIDPLAY_LIBS"],
-+ AC_MSG_ERROR($missing_library))
-+PKG_CHECK_MODULES([DVDREAD], [dvdread],
-+ [INCLUDES="$INCLUDES $DVDREAD_CFLAGS"; LIBS="$LIBS $DVDREAD_LIBS"],
-+ AC_MSG_ERROR($missing_library))
-
- if test "$use_optical_drive" = "yes"; then
- PKG_CHECK_MODULES([CDIO], [libcdio],
-@@ -1287,6 +1293,8 @@
- XB_FIND_SONAME([MODPLUG], [modplug])
- XB_FIND_SONAME([ASS], [ass])
- XB_FIND_SONAME([MPEG2], [mpeg2])
-+XB_FIND_SONAME([HDHOMERUN], [hdhomerun])
-+XB_FIND_SONAME([SIDPLAY2], [sidplay2])
-
- # Audio encoders
- if test "x$use_libmp3lame" != "xno"; then
-@@ -2552,7 +2560,6 @@
- lib/timidity/Makefile \
- lib/asap/Makefile \
- lib/nosefart/Makefile \
-- lib/libsidplay2/Makefile \
- lib/vgmstream/Makefile \
- lib/snesapu/SNES/SNESAPU/Makefile \
- lib/stsound/StSoundLibrary/Makefile \
-@@ -2568,7 +2575,6 @@
- lib/libexif/Makefile \
- lib/libXDAAP/Makefile \
- lib/cmyth/Makefile \
-- lib/libhdhomerun/Makefile \
- lib/libsquish/Makefile \
- lib/cximage-6.0/Makefile \
- lib/libUPnP/Makefile \
---- a/lib/cximage-6.0/Makefile.in
-+++ b/lib/cximage-6.0/Makefile.in
-@@ -4,8 +4,8 @@
- ARCHIVE=$(SO:.so=.a)
- SYSDIR=../../system
- SLIB=$(SYSDIR)/$(SO)
--DIRS=CxImage raw jbig
--SLIBS=CxImage/cximage.a raw/raw.a jbig/jbig.a
-+DIRS=CxImage raw
-+SLIBS=CxImage/cximage.a raw/raw.a
-
- ifeq ($(findstring osx,$(ARCH)), osx)
- export ARCH
-@@ -21,7 +21,7 @@
- CxImage/*.o jasper/*/*.o jbig/*.o raw/*.o
- else
- $(CXX) $(CFLAGS) $(LDFLAGS) -shared -o $(SLIB) -Wl,--whole-archive $(SLIBS) \
-- -Wl,--no-whole-archive -lpng -ljasper -ljpeg -ltiff -lz -Wl,--unresolved-symbols=ignore-all
-+ -Wl,--no-whole-archive -ljbig -lpng -ljasper -ljpeg -ltiff -lz -Wl,--unresolved-symbols=ignore-all
- endif
-
- $(SLIBS): compile
---- a/xbmc/DllPaths_generated.h.in
-+++ b/xbmc/DllPaths_generated.h.in
-@@ -28,7 +28,7 @@
- #define DLL_PATH_CPLUFF "special://xbmcbin/system/libcpluff-@ARCH@.so"
- #define DLL_PATH_IMAGELIB "special://xbmcbin/system/ImageLib-@ARCH@.so"
- #define DLL_PATH_LIBEXIF "special://xbmcbin/system/libexif-@ARCH@.so"
--#define DLL_PATH_LIBHDHOMERUN "special://xbmcbin/system/hdhomerun-@ARCH@.so"
-+#define DLL_PATH_LIBHDHOMERUN "@HDHOMERUN_SONAME@"
- #define DLL_PATH_MEDIAINFO "special://xbmcbin/system/mediainfo-@ARCH@.so"
- #define DLL_PATH_LIBCMYTH "special://xbmcbin/system/libcmyth-@ARCH@.so"
-
-@@ -55,7 +55,7 @@
- #define DLL_PATH_MODULE_CODEC "special://xbmcbin/system/players/paplayer/dumb-@ARCH@.so"
- #define DLL_PATH_MPC_CODEC "special://xbmcbin/system/players/paplayer/libmpcdec-@ARCH@.so"
- #define DLL_PATH_NSF_CODEC "special://xbmcbin/system/players/paplayer/nosefart-@ARCH@.so"
--#define DLL_PATH_SID_CODEC "special://xbmcbin/system/players/paplayer/libsidplay2-@ARCH@.so"
-+#define DLL_PATH_SID_CODEC "@SIDPLAY2_SONAME@"
- #define DLL_PATH_SPC_CODEC "special://xbmcbin/system/players/paplayer/SNESAPU-@ARCH@.so"
- #define DLL_PATH_VGM_CODEC "special://xbmcbin/system/players/paplayer/vgmstream-@ARCH@.so"
- #define DLL_PATH_WAVPACK_CODEC "@WAVPACK_SONAME@"
---- a/xbmc/filesystem/DllHDHomeRun.h
-+++ b/xbmc/filesystem/DllHDHomeRun.h
-@@ -20,7 +20,7 @@
- */
-
- #include "DynamicDll.h"
--#include "lib/libhdhomerun/hdhomerun.h"
-+#include "libhdhomerun/hdhomerun.h"
-
- class DllHdHomeRunInterface
- {
---- a/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
-+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
-@@ -34,6 +34,8 @@
- #define HAVE_CONFIG_H
- #endif
-
-+ // pull in XBMC's config h instead of dvdnav's one
-+ #include "xbmc/config.h"
- #include "dvdnav/dvdnav_internal.h"
- #include "dvdnav/vm.h"
- #include "dvdnav/dvd_types.h"
diff --git a/debian/patches/07-use-system-groovy.patch b/debian/patches/07-use-system-groovy.patch
deleted file mode 100644
index 1c1de64..0000000
--- a/debian/patches/07-use-system-groovy.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Use system's groovy instead of the embedded one
- .
-Author: Balint Reczey <balint at balintreczey.hu>
-Forwarded: not-needed
-
-diff --git a/codegenerator.mk b/codegenerator.mk
-index 6689777..6afaa7d 100644
---- a/codegenerator.mk
-+++ b/codegenerator.mk
-@@ -33,10 +33,9 @@ vpath %.i $(INTERFACES_DIR)/swig
-
- $(GENDIR)/%.cpp: $(GENDIR)/%.xml $(JAVA) $(SWIG) $(DOXY_XML_PATH)
- # Work around potential groovy bug reported at: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733234
-- $(JAVA) -cp "$(GROOVY_DIR)/groovy-all-2.1.7.jar:$(GROOVY_DIR)/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" \
-- org.codehaus.groovy.tools.FileSystemCompiler -d $(TOPDIR)/tools/codegenerator $(TOPDIR)/tools/codegenerator/Helper.groovy $(TOPDIR)/tools/codegenerator/SwigTypeParser.groovy $(INTERFACES_DIR)/python/MethodType.groovy $(INTERFACES_DIR)/python/PythonTools.groovy
-- $(JAVA) -cp "$(GROOVY_DIR)/groovy-all-2.1.7.jar:$(GROOVY_DIR)/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" \
-- groovy.ui.GroovyMain $(TOPDIR)/tools/codegenerator/Generator.groovy $< $(INTERFACES_DIR)/python/PythonSwig.cpp.template $@ $(DOXY_XML_PATH)
-+ groovyc -cp "/usr/share/java/groovy.jar:/usr/share/java/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" -d tools/codegenerator tools/codegenerator/Helper.groovy tools/codegenerator/SwigTypeParser.groovy $(INTERFACES_DIR)/python/MethodType.groovy $(INTERFACES_DIR)/python/PythonTools.groovy
-+ groovy -cp "/usr/share/java/groovy.jar:/usr/share/java/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" \
-+ $(TOPDIR)/tools/codegenerator/Generator.groovy $< $(INTERFACES_DIR)/python/PythonSwig.cpp.template $@ $(DOXY_XML_PATH)
- rm $<
-
- $(GENDIR)/%.xml: %.i $(SWIG) $(JAVA) $(GENERATE_DEPS)
diff --git a/debian/patches/08-armel.patch b/debian/patches/08-armel.patch
deleted file mode 100644
index 23a983f..0000000
--- a/debian/patches/08-armel.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/xbmc/utils/MathUtils.h
-+++ b/xbmc/utils/MathUtils.h
-@@ -35,6 +35,7 @@
- #if defined(__ppc__) || \
- defined(__powerpc__) || \
- defined(__mips__) || \
-+ (defined(__VFP_FP__) && defined(__SOFTFP__)) || \
- (defined(TARGET_DARWIN_IOS) && defined(__llvm__)) || \
- (defined(TARGET_ANDROID) && defined(__arm__)) || \
- defined(TARGET_RASPBERRY_PI)
-@@ -44,6 +45,7 @@
- #if defined(__ppc__) || \
- defined(__powerpc__) || \
- defined(__mips__) || \
-+ (defined(__VFP_FP__) && defined(__SOFTFP__)) || \
- (defined(TARGET_DARWIN) && defined(__llvm__)) || \
- (defined(TARGET_ANDROID) && defined(__arm__)) || \
- defined(TARGET_RASPBERRY_PI)
diff --git a/debian/patches/09-use-correct-ftgl.h b/debian/patches/09-use-correct-ftgl.h
deleted file mode 100644
index 745aa9c..0000000
--- a/debian/patches/09-use-correct-ftgl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/xbmc/visualizations/XBMCProjectM/libprojectM/Renderer.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Renderer.hpp
-index 7d1bfdf..3e7b11b 100644
---- a/xbmc/visualizations/XBMCProjectM/libprojectM/Renderer.hpp
-+++ b/xbmc/visualizations/XBMCProjectM/libprojectM/Renderer.hpp
-@@ -25,7 +25,7 @@
- #include <FTGLPixmapFont.h>
- #include <FTGLExtrdFont.h>
- #else
--#include <FTGL/FTGL.h>
-+#include <FTGL/ftgl.h>
- #include <FTGL/FTGLPixmapFont.h>
- #include <FTGL/FTGLExtrdFont.h>
- #endif
diff --git a/debian/patches/11-fix-vdpau-include.patch b/debian/patches/11-fix-vdpau-include.patch
deleted file mode 100644
index cca68ea..0000000
--- a/debian/patches/11-fix-vdpau-include.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Include libavcodec/vdpau.h as C library
- This fixes a linking failure with av_vdpau_alloc_context.
-
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Last-Update: <2014-10-24>
-
---- xbmc-13.2+dfsg1.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-+++ xbmc-13.2+dfsg1/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-@@ -43,7 +43,6 @@
- #include "DllAvUtil.h"
- #include "DVDVideoCodec.h"
- #include "DVDVideoCodecFFmpeg.h"
--#include "libavcodec/vdpau.h"
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #define GLX_GLXEXT_PROTOTYPES
-@@ -52,7 +51,6 @@
- #include "DllAvUtil.h"
- #include "DVDVideoCodec.h"
- #include "DVDVideoCodecFFmpeg.h"
--#include "libavcodec/vdpau.h"
- #include "threads/CriticalSection.h"
- #include "threads/SharedSection.h"
- #include "settings/VideoSettings.h"
-@@ -62,6 +60,14 @@
- #include "utils/ActorProtocol.h"
- #include <list>
-
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+#include "libavcodec/vdpau.h"
-+#ifdef __cplusplus
-+}
-+#endif
-+
- using namespace Actor;
-
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 11b7552..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,25 +0,0 @@
-0001-Don-t-enter-ffmpeg-dir-when-using-external-ffmpeg-li.patch
-0002-Fix-compilation-with-libav-10-beta1.patch
-0004-Disable-static-ffmpeg-when-using-external-ffmpeg-liba.patch
-0005-Fix-av_stream_get_r_frame_rate-Libav-hack-accessor.patch
-0006-Define-AV_CODEC_ID_SUBRIP-to-AV_CODEC_ID_TEXT-in-lib.patch
-0007-Enable-using-external-ffmpeg-in-.-configure.patch
-0008-Setup-AVVDPAUContext-with-API-calls-instead-of-using.patch
-0009-Use-VDPAU-in-Libav-hacks-only-when-VDPAU-support-is-.patch
-0011-mips-add-guards.patch
-0012-mips-add-atomics.patch
-0013-mips-Add-configure-option-for-mips-and-mipsel.patch
-0014-mips-Don-t-use-ASM-round-and-truncate-on-MIPS.patch
-0016-mips-Fix-build-with-using-OpenGL-rendering.patch
-0017-libav-Fix-uninitialized-read.patch
-0018-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch
-0019-Fix-bashisms-in-shell-scripts.patch
-03-privacy.patch
-04-differentiate-from-vanilla-XBMC.patch
-05-Fix-GLES-with-X11.patch
-06-use-external-libraries.patch
-07-use-system-groovy.patch
-08-armel.patch
-09-use-correct-ftgl.h
-11-fix-vdpau-include.patch
-
diff --git a/debian/rules b/debian/rules
index e4263d1..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,260 +1,4 @@
#!/usr/bin/make -f
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ifeq (,$(filter i386 amd64,$(DEB_HOST_ARCH)))
- ARCH_SPECIFIC_OPTIONS = --disable-crystalhd
-else
- ARCH_SPECIFIC_OPTIONS = --enable-crystalhd
- ARCH_SPECIFIC_LIB_RECOMMENDS = -lcrystalhd
-endif
-
-GL_CONFIG_OPTIONS = --enable-gl --disable-gles --enable-vdpau
-ARCH_SPECIFIC_LIB_RECOMMENDS_ADD = -lvdpau
-
-# Enable gles for armel, armhf
-# Also disable VDPAU and VAAPI there since they break the build with gles
-ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
-GL_CONFIG_OPTIONS = --disable-gl --enable-gles --disable-vdpau --disable-vaapi
-ARCH_SPECIFIC_LIB_RECOMMENDS_ADD =
-else
-# Enable OpenGL but no VDPAU or VAAPI for MIPS
-ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
-GL_CONFIG_OPTIONS = --enable-gl --disable-gles --disable-vdpau --disable-vaapi
-ARCH_SPECIFIC_LIB_RECOMMENDS_ADD =
-endif
-endif
-
-ARCH_SPECIFIC_LIB_RECOMMENDS += $(ARCH_SPECIFIC_LIB_RECOMMENDS_ADD)
-
-# Various environment variables to set
-DEB_CFLAGS ?= $(shell dpkg-buildflags --get CPPFLAGS) \
- $(filter-out -g -O2, $(shell dpkg-buildflags --get CFLAGS))
-DEB_CXXFLAGS ?= $(shell dpkg-buildflags --get CPPFLAGS) \
- $(filter-out -g -O2, $(shell dpkg-buildflags --get CXXFLAGS))
-DEB_LDFLAGS ?= $(shell dpkg-buildflags --get LDFLAGS) $(shell pkg-config --libs ftgl)
-ENV_OPTIONS = CFLAGS="$(DEB_CFLAGS)" CXXFLAGS="$(DEB_CXXFLAGS)" \
- LDFLAGS="$(DEB_LDFLAGS)"
-
-# fall back to old location of libhdhomerun includes if needed
-ifneq ("$(wildcard /usr/lib/libhdhomerun/hdhomerun.h)","")
- DEB_CXXFLAGS += -I/usr/lib/
-endif
-
-# List of options to pass to configure. Can be overridden.
-# Extra options can simply be passed using XBMC_CONFIG_EXTRA_OPTIONS env
-# variable.
-XBMC_CONFIG_OPTIONS ?= --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr --docdir=/usr/share/doc/xbmc \
- --enable-debug \
- $(GL_CONFIG_OPTIONS) \
- --disable-vdadecoder \
- --disable-vtbdecoder \
- --disable-openmax \
- --disable-tegra \
- --disable-profiling \
- --enable-joystick \
- --enable-xrandr \
- --enable-sdl \
- --enable-pulse \
- --enable-rtmp \
- --enable-ffmpeg-libvorbis \
- --disable-mid \
- --disable-hal \
- --enable-avahi \
- --disable-asap-codec \
- --enable-webserver \
- --enable-optical-drive \
- --enable-texturepacker \
- --enable-nfs \
- --enable-libcec \
- --disable-afpclient \
- --enable-airtunes \
- --enable-external-libraries \
- --enable-libav-compat \
- --disable-dependency-tracking \
- --disable-dvdcss \
- --disable-non-free \
- --disable-gtest \
- $(ARCH_SPECIFIC_OPTIONS) \
- $(XBMC_CONFIG_EXTRA_OPTIONS) \
- $(ENV_OPTIONS)
-
-# Used to show what config options are enabled
-show-xbmc-config-options:
- $(info $(XBMC_CONFIG_OPTIONS))
-
%:
- dh $@ --with autoreconf --with python2 --parallel
-
-override_dh_clean:
- dh_clean libtool xbmc/config.h xbmc/stamp-h1
- find . -name config.status -o -name config.cache -o -name config.log \
- -exec rm -f "{}" \;
-
-# Use package's version in XBMC
-VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: \(.*\)/\1/p')
-
-# fall back to old location of DejaVuSans.ttf if needed
-ifneq ("$(wildcard /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf)","")
-DEJAVUSANS=/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf
-else
-DEJAVUSANS=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
-endif
-
-override_dh_auto_configure: configure
- sed -i 's/DEB_VERSION/"'$(VERSION)'"/' xbmc/GUIInfoManager.cpp
- mkdir -p xbmc/visualizations/XBMCProjectM/libprojectM/fonts
- -ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf xbmc/visualizations/XBMCProjectM/libprojectM/fonts/
- -ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/VeraMono.ttf xbmc/visualizations/XBMCProjectM/libprojectM/fonts/
- fontforge -script $(CURDIR)/debian/mergefonts.ff \
- /usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf \
- $(DEJAVUSANS) \
- $(CURDIR)/media/Fonts/arial.ttf
- ./bootstrap
- ./configure $(XBMC_CONFIG_OPTIONS)
- # Add Debian related notes to XBMC's original logo
- mkdir -p $(CURDIR)/debian/tmp/home/user
- HOME=$(CURDIR)/debian/tmp/home/user gimp -i -b '(load "debian/xcf2png.scm") (xcf2png "debian/xbmc-logo.xcf" "addons/skin.confluence/media/xbmc-logo.png") (gimp-quit 0)'
-
-override_dh_auto_install:
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- $(MAKE) eventclients DESTDIR=$(CURDIR)/debian/tmp \
- WII_EXTRA_OPTS=-DCWIID_OLD
- mkdir -p $(CURDIR)/debian/tmp/usr/include/xbmc
- sed 's|../library.xbmc.addon/|xbmc/|' addons/library.xbmc.gui/libXBMC_gui.h > \
- $(CURDIR)/debian/tmp/usr/include/xbmc/libXBMC_gui.h
- sed 's|../library.xbmc.addon/|xbmc/|' addons/library.xbmc.pvr/libXBMC_pvr.h > \
- $(CURDIR)/debian/tmp/usr/include/xbmc/libXBMC_pvr.h
-
-override_dh_install:
- dh_install -XLICENCE -XLICENSE \
- -XLicence.txt -XLicense.txt -XLiberationSans-Regular.ttf \
- -XDejaVuSans.ttf -XDejaVuSans-Bold.ttf -XLICENSE.txt \
- -XRoboto-Bold.ttf -XRoboto-Regular.ttf -XNOTICE.txt \
- -Xjquery-1.8.2.min.js -Xiscroll-min.js
-
-override_dh_makeshlibs:
- # We don't install shared libraries in standard locations so don't run
- # dh_makeshlibs
- # OTOH we need to remove exec flag after dh_strip
- chmod -x $(CURDIR)/debian/tmp/usr/lib/xbmc/addons/visualization.*/*.vis
- -chmod -x $(CURDIR)/debian/tmp/usr/lib/xbmc/addons/screensaver.rsxs.*/*.xbs
-
-override_dh_shlibdeps: debian/tmp/xbmc-bin-depends-dummy.so debian/tmp/xbmc-bin-recommends-dummy.so
- dh_shlibdeps -a -O--parallel \
- -l$(CURDIR)/debian/xbmc-bin/usr/lib/xbmc/system/players/dvdplayer
- # Need to manually add dependencies for dlopened libs.
- dpkg-shlibdeps -pdlopenlibs -edebian/tmp/xbmc-bin-depends-dummy.so -xlibc6 -O >>debian/xbmc-bin.substvars
- dpkg-shlibdeps -dRecommends -edebian/tmp/xbmc-bin-recommends-dummy.so -xlibc6 -O >>debian/xbmc-bin.substvars
-
-debian/tmp/xbmc-bin-depends-dummy.so:
- mkdir -p debian/tmp
- cc -xc -shared -Wl,--no-as-needed -o $@ /dev/null \
- -lcurl-gnutls
-
-debian/tmp/xbmc-bin-recommends-dummy.so:
- mkdir -p debian/tmp
- cc -xc -shared -Wl,--no-as-needed -o $@ /dev/null \
- -lass \
- -lbluray \
- -lcec \
- -lFLAC \
- -lhdhomerun \
- -lmad \
- -lmodplug \
- -lmp3lame \
- -lmpeg2 \
- -lnfs \
- -logg \
- -lplist \
- -lrtmp \
- -lshairport \
- -lvorbis \
- -lvorbisenc \
- -lvorbisfile \
- $(ARCH_SPECIFIC_LIB_RECOMMENDS)
-
-override_dh_strip:
- dh_strip --dbg-package=xbmc-dbg
-
-override_dh_installinit:
- echo "Shipping systemd xbmc.service file as an example only"
-
-# Get original XBMC source and cut not needed bits.
-# Based on https://github.com/xbmc/xbmc-packaging/blob/master/xbmc-get-orig-source
-ORIG_SRC_DIR := debian/tmp-src-dir
-UPSTREAM_VER ?= $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9]:)?([0-9.]+)(\+dfsg\d+)?.*$$/\2/p')
-DFSG_VER = $(UPSTREAM_VER)+dfsg1
-
-get-orig-source:
- mkdir -p $(ORIG_SRC_DIR)
- wget -O $(ORIG_SRC_DIR)/xbmc-orig.tar.gz http://mirrors.xbmc.org/releases/source/xbmc-$(UPSTREAM_VER).tar.gz
- tar -C $(ORIG_SRC_DIR) -xf $(ORIG_SRC_DIR)/xbmc-orig.tar.gz
- rm $(ORIG_SRC_DIR)/xbmc-orig.tar.gz
- # Remove non-free components
- find $(ORIG_SRC_DIR)/* -depth \( -iname '*dvdcss*' -o -iname '*unrar*' \) -exec rm -rf "{}" \;
- # Remove components not needed for Linux
- rm -rf $(ORIG_SRC_DIR)/*/lib/afpfs-ng \
- $(ORIG_SRC_DIR)/*/lib/enca \
- $(ORIG_SRC_DIR)/*/lib/cximage-6.0/jasper \
- $(ORIG_SRC_DIR)/*/lib/cximage-6.0/jbig \
- $(ORIG_SRC_DIR)/*/lib/cximage-6.0/jpeg \
- $(ORIG_SRC_DIR)/*/lib/cximage-6.0/mng \
- $(ORIG_SRC_DIR)/*/lib/cximage-6.0/png \
- $(ORIG_SRC_DIR)/*/lib/cximage-6.0/tiff \
- $(ORIG_SRC_DIR)/*/lib/cximage-6.0/zlib \
- $(ORIG_SRC_DIR)/*/lib/freetype \
- $(ORIG_SRC_DIR)/*/lib/gtest \
- $(ORIG_SRC_DIR)/*/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.3 \
- $(ORIG_SRC_DIR)/*/lib/libass \
- $(ORIG_SRC_DIR)/*/lib/libbluray \
- $(ORIG_SRC_DIR)/*/lib/libcec \
- $(ORIG_SRC_DIR)/*/lib/libhdhomerun \
- $(ORIG_SRC_DIR)/*/lib/liblame \
- $(ORIG_SRC_DIR)/*/lib/libmad \
- $(ORIG_SRC_DIR)/*/lib/libmicrohttpd \
- $(ORIG_SRC_DIR)/*/lib/libmodplug \
- $(ORIG_SRC_DIR)/*/lib/libmpeg2 \
- $(ORIG_SRC_DIR)/*/lib/libnfs \
- $(ORIG_SRC_DIR)/*/lib/librtmp \
- $(ORIG_SRC_DIR)/*/lib/libshairport \
- $(ORIG_SRC_DIR)/*/lib/libsidplay2 \
- $(ORIG_SRC_DIR)/*/lib/groovy \
- $(ORIG_SRC_DIR)/*/lib/taglib \
- $(ORIG_SRC_DIR)/*/lib/win32 \
- $(ORIG_SRC_DIR)/*/project/Win32BuildSetup \
- $(ORIG_SRC_DIR)/*/addons/service.xbmc.versioncheck \
- $(ORIG_SRC_DIR)/*/addons/webinterface.default/js/iscroll-min.js \
- $(ORIG_SRC_DIR)/*/addons/webinterface.default/js/jquery-1.8.2.min.js \
- $(ORIG_SRC_DIR)/*/addons/skin.confluence/fonts/Roboto-*.ttf \
- $(ORIG_SRC_DIR)/*/media/Fonts/arial.ttf \
- $(ORIG_SRC_DIR)/*/xbmc/visualizations/XBMCProjectM/libprojectM/fonts/Vera*.ttf
- find $(ORIG_SRC_DIR)/* -depth \( \( -iname '*.so' -o -iname '*.exe' -o -iname '*.lib' \
- -o -iname '*.dll' -o -iname '*.dylib' -o -iname '*.a' -o -iname '*.obj' \
- \) -exec rm -rf "{}" \; \)
- # Remove components not needed for Linux when using external libs
- rm -rf $(ORIG_SRC_DIR)/*/lib/ffmpeg
- # Remove temp files and other cruft from source tarball
- # The find command snippet here was taken from debhelper's dh_clean command
- # with some modification to delete more unneeded files.
- find $(ORIG_SRC_DIR)/* -depth \( \( -type f -a \
- \( -name '#*#' -o -name '.*~' -o -name '*~' -o -name DEADJOE \
- -o -name '*.orig' -o -name '*.rej' -o -name '*.bak' \
- -o -name '.*.orig' -o -name .*.rej -o -name '.SUMS' \
- -o -name TAGS -o \( -path '*/.deps/*' -a -name '*.P' \) \
- -o -name config.status -o -name config.cache -o -name config.log \
- -o -name 'VS20*' \) -exec rm -f "{}" \; \) -o \
- \( -type d -a -name autom4te.cache -prune -exec rm -rf "{}" \; \) \)
- rm $(ORIG_SRC_DIR)/*/.gitignore
- #Remove empty directories
- find $(ORIG_SRC_DIR)/* -type d -empty -delete
- (cd $(ORIG_SRC_DIR) && tar -cJf ../../xbmc_$(DFSG_VER).orig.tar.xz *)
- rm -rf $(ORIG_SRC_DIR)
-
-.PHONY: get-orig-source
+ dh $@
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..c0d858d
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,5 @@
+# We don't build XBMC anymore those are not issues
+xbmc source: ancient-autotools-helper-file
+xbmc source: outdated-autotools-helper-file
+xbmc source: duplicate-long-description
+xbmc source: duplicate-short-description
diff --git a/debian/xbmc-addons-dev.README.Debian b/debian/xbmc-addons-dev.README.Debian
deleted file mode 100644
index 9d87821..0000000
--- a/debian/xbmc-addons-dev.README.Debian
+++ /dev/null
@@ -1,2 +0,0 @@
-The current PVR API version can be found in xbmc_pvr_types.h:
-XBMC_PVR_API_VERSION
diff --git a/debian/xbmc-addons-dev.install b/debian/xbmc-addons-dev.install
deleted file mode 100644
index a4cefce..0000000
--- a/debian/xbmc-addons-dev.install
+++ /dev/null
@@ -1,7 +0,0 @@
-addons/library.xbmc.addon/libXBMC_addon.h usr/include/xbmc/
-addons/library.xbmc.codec/libXBMC_codec.h usr/include/xbmc/
-usr/include/xbmc/libXBMC_gui.h
-usr/include/xbmc/libXBMC_pvr.h
-xbmc/addons/include/*.h usr/include/xbmc/
-xbmc/addons/include/*.hpp usr/include/xbmc/
-xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h usr/include/xbmc/
diff --git a/debian/xbmc-bin.install b/debian/xbmc-bin.install
deleted file mode 100644
index cddb90a..0000000
--- a/debian/xbmc-bin.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/xbmc
diff --git a/debian/xbmc-eventclients-common.install b/debian/xbmc-eventclients-common.install
deleted file mode 100644
index 2ce1f7f..0000000
--- a/debian/xbmc-eventclients-common.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/python*/*/xbmc
-usr/share/pixmaps/xbmc
diff --git a/debian/xbmc-eventclients-dev.examples b/debian/xbmc-eventclients-dev.examples
deleted file mode 100644
index abcee3c..0000000
--- a/debian/xbmc-eventclients-dev.examples
+++ /dev/null
@@ -1 +0,0 @@
-tools/EventClients/examples/*
diff --git a/debian/xbmc-eventclients-dev.install b/debian/xbmc-eventclients-dev.install
deleted file mode 100644
index 23114c9..0000000
--- a/debian/xbmc-eventclients-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/xbmc/xbmcclient.h
diff --git a/debian/xbmc-eventclients-j2me.install b/debian/xbmc-eventclients-j2me.install
deleted file mode 100644
index 0a3631d..0000000
--- a/debian/xbmc-eventclients-j2me.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/xbmc-j2meremote
diff --git a/debian/xbmc-eventclients-j2me.manpages b/debian/xbmc-eventclients-j2me.manpages
deleted file mode 100644
index 0dec8f0..0000000
--- a/debian/xbmc-eventclients-j2me.manpages
+++ /dev/null
@@ -1 +0,0 @@
-docs/manpages/xbmc-j2meremote.1
diff --git a/debian/xbmc-eventclients-ps3.install b/debian/xbmc-eventclients-ps3.install
deleted file mode 100644
index c761b71..0000000
--- a/debian/xbmc-eventclients-ps3.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/xbmc-ps3remote
diff --git a/debian/xbmc-eventclients-ps3.manpages b/debian/xbmc-eventclients-ps3.manpages
deleted file mode 100644
index 17b0424..0000000
--- a/debian/xbmc-eventclients-ps3.manpages
+++ /dev/null
@@ -1 +0,0 @@
-docs/manpages/xbmc-ps3remote.1
diff --git a/debian/xbmc-eventclients-wiiremote.install b/debian/xbmc-eventclients-wiiremote.install
deleted file mode 100644
index f6f7193..0000000
--- a/debian/xbmc-eventclients-wiiremote.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/xbmc-wiiremote
diff --git a/debian/xbmc-eventclients-wiiremote.manpages b/debian/xbmc-eventclients-wiiremote.manpages
deleted file mode 100644
index 88aff20..0000000
--- a/debian/xbmc-eventclients-wiiremote.manpages
+++ /dev/null
@@ -1 +0,0 @@
-docs/manpages/xbmc-wiiremote.1
diff --git a/debian/xbmc-eventclients-xbmc-send.install b/debian/xbmc-eventclients-xbmc-send.install
deleted file mode 100644
index 6981d64..0000000
--- a/debian/xbmc-eventclients-xbmc-send.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/xbmc-send
diff --git a/debian/xbmc-eventclients-xbmc-send.manpages b/debian/xbmc-eventclients-xbmc-send.manpages
deleted file mode 100644
index baa7b38..0000000
--- a/debian/xbmc-eventclients-xbmc-send.manpages
+++ /dev/null
@@ -1 +0,0 @@
-docs/manpages/xbmc-send.1
diff --git a/debian/xbmc-logo.xcf b/debian/xbmc-logo.xcf
deleted file mode 100644
index 85c12ae..0000000
Binary files a/debian/xbmc-logo.xcf and /dev/null differ
diff --git a/debian/xbmc.docs b/debian/xbmc.docs
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/xbmc.examples b/debian/xbmc.examples
deleted file mode 100644
index 4740e81..0000000
--- a/debian/xbmc.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/xbmc.service
\ No newline at end of file
diff --git a/debian/xbmc.install b/debian/xbmc.install
deleted file mode 100644
index 4fe1bf9..0000000
--- a/debian/xbmc.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin/xbmc
-usr/share/xbmc
-usr/share/icons
-usr/share/applications
-usr/share/xbmc/addons/skin.confluence
-usr/bin/xbmc-standalone
-usr/share/xsessions
diff --git a/debian/xbmc.links b/debian/xbmc.links
deleted file mode 100644
index 3404745..0000000
--- a/debian/xbmc.links
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf usr/share/xbmc/addons/skin.confluence/fonts/DejaVuSans-Bold.ttf
-usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/xbmc/addons/skin.confluence/fonts/DejaVuSans.ttf
-usr/share/fonts/truetype/roboto/Roboto-Bold.ttf usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Bold.ttf
-usr/share/fonts/truetype/roboto/Roboto-Regular.ttf usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Regular.ttf
-usr/share/javascript/jquery/jquery.min.js /usr/share/xbmc/addons/webinterface.default/js/jquery-1.8.2.min.js
-usr/share/javascript/iscroll/iscroll-min.js /usr/share/xbmc/addons/webinterface.default/js/iscroll-min.js
\ No newline at end of file
diff --git a/debian/xbmc.lintian-overrides b/debian/xbmc.lintian-overrides
deleted file mode 100644
index 0043e1c..0000000
--- a/debian/xbmc.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# XBMC is a recursive acronym for "XBMC Media Center", hence why it appears
-# at the start of the package description.
-xbmc: description-starts-with-package-name
diff --git a/debian/xbmc.manpages b/debian/xbmc.manpages
deleted file mode 100644
index 52b9a18..0000000
--- a/debian/xbmc.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-docs/manpages/xbmc.bin.1
-docs/manpages/xbmc.1
-docs/manpages/xbmc-standalone.1
diff --git a/debian/xbmc.menu b/debian/xbmc.menu
deleted file mode 100644
index 0b4550d..0000000
--- a/debian/xbmc.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(xbmc):needs="X11" section="Applications/Video" \
- title="xbmc" command="/usr/bin/xbmc"
diff --git a/debian/xbmc.mime b/debian/xbmc.mime
deleted file mode 100644
index 7a3d6be..0000000
--- a/debian/xbmc.mime
+++ /dev/null
@@ -1,19 +0,0 @@
-video/mpeg; xbmc %s; description="MPEG Video";
-video/x-mpeg; xbmc %s; description="MPEG Video";
-video/mpeg-system; xbmc %s; description="MPEG Video";
-video/x-mpeg-system; xbmc %s; description="MPEG Video";
-audio/x-wav; xbmc %s; description="WAV Audio"; nametemplate=%s.wav;
-video/mpeg4; xbmc %s; description="MPEG-4 Video";
-audio/mpeg; xbmc %s; description="MPEG Audio"; nametemplate=%s.mpg;
-audio/mpegurl; xbmc %s; description="MPEG Audio URL"; nametemplate=%s.m3u;
-audio/x-mp3; xbmc %s; nametemplate=%s.mp3; description="MPEG Audio";
-audio/mpeg4; xbmc %s; description="MPEG-4 Audio";
-application/mpeg4-iod; xbmc %s; description="MPEG-4 Video";
-application/mpeg4-muxcodetable; xbmc %s; description="MPEG-4 Video";
-video/x-msvideo; xbmc %s; description="MS Video (AVI)";
-video/quicktime; xbmc %s; description="Apple Quicktime Video";
-application/ogg; xbmc %s; nametemplate=%s.ogg; description="Ogg stream";
-application/x-ogg; xbmc %s; nametemplate=%s.ogg; description="Ogg stream";
-video/ogg; xbmc %s; description="Ogg Video";
-application/x-ms-asf-plugin; xbmc %s; description="Windows Media Video";
-application/x-mplayer2; xbmc %s; description="Windows Media";
diff --git a/debian/xbmc.service b/debian/xbmc.service
deleted file mode 100644
index 9101fb2..0000000
--- a/debian/xbmc.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description = XBMC Media Center
-After = remote-fs.target
-After = syslog.target
-
-[Service]
-User = xbmc
-Group = xbmc
-Type = simple
-Restart = always
-RestartSec=5
-KillMode=process
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0
-
-[Install]
-WantedBy = multi-user.target
diff --git a/debian/xcf2png.scm b/debian/xcf2png.scm
deleted file mode 100644
index c8a7443..0000000
--- a/debian/xcf2png.scm
+++ /dev/null
@@ -1,8 +0,0 @@
-; based on http://stackoverflow.com/questions/5794640/how-to-convert-xcf-to-png-using-gimp-from-the-command-line
-(define (xcf2png from to)
- (let* ((image 0) (layer 0))
- (set! image (car (gimp-file-load RUN-NONINTERACTIVE from from)))
- (set! layer (car (gimp-image-merge-visible-layers image CLIP-TO-IMAGE)))
- (gimp-file-save RUN-NONINTERACTIVE image layer to to)
- )
- )
--
xbmc packaging
More information about the pkg-multimedia-commits
mailing list