Commit 715ecf93 authored by Balint Reczey's avatar Balint Reczey

First kodi package based on xbmc 2:13.2+dfsg1-4 packaging

parent b03e1d8f
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
kodi (14.0~beta1+dfsg1-1) UNRELEASED; urgency=medium
* First packaged Kodi version based on xbmc 2:13.2+dfsg1-4
-- Balint Reczey <balint@balintreczey.hu> Sat, 08 Nov 2014 11:14:40 +0100
Source: xbmc
Section: video
Priority: optional
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
Uploaders: Balint Reczey <balint@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
Standards-Version: 3.9.5
Homepage: http://xbmc.org/
Vcs-Git: git://git.debian.org/pkg-multimedia/xbmc.git
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}
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.
Package: xbmc-bin
Architecture: any
Depends: ${shlibs:Depends},
${dlopenlibs:Depends},
${misc:Depends}
Recommends: ${shlibs:Recommends}
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.
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.
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.
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.
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.
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.
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.
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.
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.
This source diff could not be displayed because it is too large. You can view the blob instead.
The current PVR API version can be found in xbmc_pvr_types.h:
XBMC_PVR_API_VERSION
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/
usr/lib/python*/*/xbmc
usr/share/pixmaps/xbmc
tools/EventClients/examples/*
usr/include/xbmc/xbmcclient.h
docs/manpages/xbmc-j2meremote.1
docs/manpages/xbmc-ps3remote.1
docs/manpages/xbmc-wiiremote.1
debian/xbmc.service
\ No newline at end of file
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
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
# 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
docs/manpages/xbmc.bin.1
docs/manpages/xbmc.1
docs/manpages/xbmc-standalone.1
?package(xbmc):needs="X11" section="Applications/Video" \
title="xbmc" command="/usr/bin/xbmc"
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";
[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
#!/usr/bin/fontforge
# merge $1 and $2 to $3 fonts
Open($1);
ScaleToEm(2048)
MergeFonts($2);
Generate($3);
From d1c2e454c9a5d7413ae5b6fe05c2c1168baf0f31 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint@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))
From bf558f775574b2243f1da21b345e8ae252b500d7 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint@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
From 5451bad08317e8f36d9541980f773ceeb7262e80 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint@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])
From e7fc1bf22a8ee7e744883eaa0c8f2910d51b4208 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint@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
From bffb887a8d1137b26ca2605734c4c03673a40b42 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint@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;
From dc85016024fef825a8fffcd9881a7a0bd86912af Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint@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
From 5c0cf96c60f8545b3bc7118f2e0060a908b63b7a Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@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