summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD36
-rw-r--r--libdlna-avformat.patch22
-rw-r--r--libdlna-ffmpeg3.patch248
4 files changed, 325 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 00000000000..2085ef5d1a4
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,19 @@
+pkgbase = libdlna
+ pkgdesc = Open-source implementation of DLNA (Digital Living Network Alliance) standards
+ pkgver = 0.2.4
+ pkgrel = 16
+ url = http://libdlna.geexbox.org
+ arch = x86_64
+ license = LGPL
+ depends = glibc
+ depends = ffmpeg
+ options = !makeflags
+ source = http://libdlna.geexbox.org/releases/libdlna-0.2.4.tar.bz2
+ source = libdlna-ffmpeg3.patch
+ source = libdlna-avformat.patch
+ md5sums = 64d7de57aff5a729f2434fc5e69b4ffc
+ md5sums = 214e6957bbb1894082acb62974753f30
+ md5sums = f7a6f36930fa212b0422daf88befa856
+
+pkgname = libdlna
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 00000000000..5bb62555b60
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 266875 2017-11-15 14:29:11Z foutrelis $
+# Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
+# Contributor: kastor <kastor@fobos.org.ar>
+
+pkgname=libdlna
+pkgver=0.2.4
+pkgrel=16
+pkgdesc="Open-source implementation of DLNA (Digital Living Network Alliance) standards "
+url="http://libdlna.geexbox.org"
+license=("LGPL")
+arch=('x86_64')
+options=('!makeflags') # not parallel safe, error find -ldlna
+depends=('glibc' 'ffmpeg')
+source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2"
+ libdlna-ffmpeg3.patch
+ libdlna-avformat.patch)
+md5sums=('64d7de57aff5a729f2434fc5e69b4ffc'
+ '214e6957bbb1894082acb62974753f30'
+ 'f7a6f36930fa212b0422daf88befa856')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../libdlna-ffmpeg3.patch
+ patch -p1 -i ../libdlna-avformat.patch
+}
+
+build() {
+ cd "$srcdir"/${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make lib
+}
+
+package() {
+ cd "$srcdir"/${pkgname}-${pkgver}
+ make DESTDIR="$pkgdir" install
+}
diff --git a/libdlna-avformat.patch b/libdlna-avformat.patch
new file mode 100644
index 00000000000..0434339b850
--- /dev/null
+++ b/libdlna-avformat.patch
@@ -0,0 +1,22 @@
+diff --git a/src/profiles.c b/src/profiles.c
+index 4622c56..ab40ef4 100644
+--- a/src/profiles.c
++++ b/src/profiles.c
+@@ -287,7 +287,7 @@ dlna_guess_media_profile (dlna_t *dlna, const char *filename)
+ return NULL;
+ }
+
+- if (av_find_stream_info (ctx) < 0)
++ if (avformat_find_stream_info (ctx, NULL) < 0)
+ {
+ if (dlna->verbosity)
+ fprintf (stderr, "can't find stream info\n");
+@@ -334,7 +334,7 @@ dlna_guess_media_profile (dlna_t *dlna, const char *filename)
+ p = p->next;
+ }
+
+- av_close_input_file (ctx);
++ avformat_close_input (&ctx);
+ free (codecs);
+ return profile;
+ }
diff --git a/libdlna-ffmpeg3.patch b/libdlna-ffmpeg3.patch
new file mode 100644
index 00000000000..e299cdb9a1e
--- /dev/null
+++ b/libdlna-ffmpeg3.patch
@@ -0,0 +1,248 @@
+diff -ur libdlna-0.2.4.orig/src/audio_aac.c libdlna-0.2.4/src/audio_aac.c
+--- libdlna-0.2.4.orig/src/audio_aac.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/audio_aac.c 2016-02-17 21:45:27.487773825 +0000
+@@ -311,7 +311,7 @@
+ return AUDIO_PROFILE_INVALID;
+
+ /* check for AAC variants codec */
+- if (ac->codec_id != CODEC_ID_AAC)
++ if (ac->codec_id != AV_CODEC_ID_AAC)
+ return AUDIO_PROFILE_INVALID;
+
+ switch (type)
+diff -ur libdlna-0.2.4.orig/src/audio_ac3.c libdlna-0.2.4/src/audio_ac3.c
+--- libdlna-0.2.4.orig/src/audio_ac3.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/audio_ac3.c 2016-02-17 21:45:27.487773825 +0000
+@@ -39,7 +39,7 @@
+ return AUDIO_PROFILE_INVALID;
+
+ /* check for AC3 codec */
+- if (ac->codec_id != CODEC_ID_AC3)
++ if (ac->codec_id != AV_CODEC_ID_AC3)
+ return AUDIO_PROFILE_INVALID;
+
+ /* supported channels: 1/0, 2/0, 3/0, 2/1, 3/1, 2/2, 3/2 */
+diff -ur libdlna-0.2.4.orig/src/audio_amr.c libdlna-0.2.4/src/audio_amr.c
+--- libdlna-0.2.4.orig/src/audio_amr.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/audio_amr.c 2016-02-17 21:45:27.487773825 +0000
+@@ -53,7 +53,7 @@
+ if (!ac)
+ return 0;
+
+- if (ac->codec_id != CODEC_ID_AMR_NB)
++ if (ac->codec_id != AV_CODEC_ID_AMR_NB)
+ return 0;
+
+ /* only mono is supported */
+@@ -89,7 +89,7 @@
+ if (!ac)
+ return 0;
+
+- if (ac->codec_id != CODEC_ID_AMR_WB)
++ if (ac->codec_id != AV_CODEC_ID_AMR_WB)
+ return 0;
+
+ /* valid sampling rates: 8, 16, 24, 32 and 48 kHz */
+diff -ur libdlna-0.2.4.orig/src/audio_atrac3.c libdlna-0.2.4/src/audio_atrac3.c
+--- libdlna-0.2.4.orig/src/audio_atrac3.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/audio_atrac3.c 2016-02-17 21:45:27.487773825 +0000
+@@ -39,7 +39,7 @@
+ return AUDIO_PROFILE_INVALID;
+
+ #if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)
+- if (ac->codec_id == CODEC_ID_ATRAC3)
++ if (ac->codec_id == AV_CODEC_ID_ATRAC3)
+ return AUDIO_PROFILE_ATRAC;
+ #endif
+
+diff -ur libdlna-0.2.4.orig/src/audio_g726.c libdlna-0.2.4/src/audio_g726.c
+--- libdlna-0.2.4.orig/src/audio_g726.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/audio_g726.c 2016-02-17 21:45:27.487773825 +0000
+@@ -31,7 +31,7 @@
+ if (!ac)
+ return AUDIO_PROFILE_INVALID;
+
+- if (ac->codec_id != CODEC_ID_ADPCM_G726)
++ if (ac->codec_id != AV_CODEC_ID_ADPCM_G726)
+ return AUDIO_PROFILE_INVALID;
+
+ if (ac->channels != 1)
+diff -ur libdlna-0.2.4.orig/src/audio_lpcm.c libdlna-0.2.4/src/audio_lpcm.c
+--- libdlna-0.2.4.orig/src/audio_lpcm.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/audio_lpcm.c 2016-02-17 21:45:27.487773825 +0000
+@@ -45,8 +45,8 @@
+ return AUDIO_PROFILE_INVALID;
+
+ /* check for 16-bit signed network-endian PCM codec */
+- if (ac->codec_id != CODEC_ID_PCM_S16BE &&
+- ac->codec_id != CODEC_ID_PCM_S16LE)
++ if (ac->codec_id != AV_CODEC_ID_PCM_S16BE &&
++ ac->codec_id != AV_CODEC_ID_PCM_S16LE)
+ return AUDIO_PROFILE_INVALID;
+
+ /* supported channels: mono or stereo */
+diff -ur libdlna-0.2.4.orig/src/audio_mp2.c libdlna-0.2.4/src/audio_mp2.c
+--- libdlna-0.2.4.orig/src/audio_mp2.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/audio_mp2.c 2016-02-17 21:45:27.487773825 +0000
+@@ -31,7 +31,7 @@
+ if (!ac)
+ return AUDIO_PROFILE_INVALID;
+
+- if (ac->codec_id != CODEC_ID_MP2)
++ if (ac->codec_id != AV_CODEC_ID_MP2)
+ return AUDIO_PROFILE_INVALID;
+
+ if (ac->channels > 5)
+diff -ur libdlna-0.2.4.orig/src/audio_mp3.c libdlna-0.2.4/src/audio_mp3.c
+--- libdlna-0.2.4.orig/src/audio_mp3.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/audio_mp3.c 2016-02-17 21:45:27.487773825 +0000
+@@ -47,7 +47,7 @@
+ return 0;
+
+ /* check for MP3 codec */
+- if (ac->codec_id != CODEC_ID_MP3)
++ if (ac->codec_id != AV_CODEC_ID_MP3)
+ return 0;
+
+ /* only mono and stereo are supported */
+diff -ur libdlna-0.2.4.orig/src/audio_wma.c libdlna-0.2.4/src/audio_wma.c
+--- libdlna-0.2.4.orig/src/audio_wma.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/audio_wma.c 2016-02-17 21:45:27.487773825 +0000
+@@ -55,7 +55,7 @@
+ return ap;
+
+ /* check for WMA codec */
+- if (ac->codec_id != CODEC_ID_WMAV1 && ac->codec_id != CODEC_ID_WMAV2)
++ if (ac->codec_id != AV_CODEC_ID_WMAV1 && ac->codec_id != AV_CODEC_ID_WMAV2)
+ return ap;
+
+ if (ac->sample_rate <= 48000)
+diff -ur libdlna-0.2.4.orig/src/av_mpeg1.c libdlna-0.2.4/src/av_mpeg1.c
+--- libdlna-0.2.4.orig/src/av_mpeg1.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/av_mpeg1.c 2016-02-17 21:45:27.487773825 +0000
+@@ -42,7 +42,7 @@
+ return NULL;
+
+ /* check for MPEG-1 video codec */
+- if (codecs->vc->codec_id != CODEC_ID_MPEG1VIDEO)
++ if (codecs->vc->codec_id != AV_CODEC_ID_MPEG1VIDEO)
+ return NULL;
+
+ /* video bitrate must be CBR at 1,151,929.1 bps */
+@@ -72,7 +72,7 @@
+ return NULL;
+
+ /* check for MPEG-1 Layer-2 audio codec */
+- if (codecs->ac->codec_id != CODEC_ID_MP2)
++ if (codecs->ac->codec_id != AV_CODEC_ID_MP2)
+ return NULL;
+
+ /* supported channels: stereo only */
+diff -ur libdlna-0.2.4.orig/src/av_mpeg2.c libdlna-0.2.4/src/av_mpeg2.c
+--- libdlna-0.2.4.orig/src/av_mpeg2.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/av_mpeg2.c 2016-02-17 21:45:27.491107148 +0000
+@@ -453,7 +453,7 @@
+ int i;
+
+ /* check for MPEG-2 MP@LL profile */
+- if (codecs->ac->codec_id == CODEC_ID_AAC)
++ if (codecs->ac->codec_id == AV_CODEC_ID_AAC)
+ {
+ /* 352x288 only */
+ if (codecs->vc->width != 352 && codecs->vc->height != 288)
+@@ -535,7 +535,7 @@
+ if (ctx->bit_rate > 19392700)
+ return NULL;
+
+- if (codecs->ac->codec_id != CODEC_ID_AC3)
++ if (codecs->ac->codec_id != AV_CODEC_ID_AC3)
+ return NULL;
+
+ /* 48 KHz only */
+@@ -615,7 +615,7 @@
+ return NULL;
+
+ /* check for MPEG-2 video codec */
+- if (codecs->vc->codec_id != CODEC_ID_MPEG2VIDEO)
++ if (codecs->vc->codec_id != AV_CODEC_ID_MPEG2VIDEO)
+ return NULL;
+
+ switch (st)
+diff -ur libdlna-0.2.4.orig/src/av_mpeg4_part10.c libdlna-0.2.4/src/av_mpeg4_part10.c
+--- libdlna-0.2.4.orig/src/av_mpeg4_part10.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/av_mpeg4_part10.c 2016-02-17 21:45:27.491107148 +0000
+@@ -1221,7 +1221,7 @@
+ return NULL;
+
+ /* check for H.264/AVC codec */
+- if (codecs->vc->codec_id != CODEC_ID_H264)
++ if (codecs->vc->codec_id != AV_CODEC_ID_H264)
+ return NULL;
+
+ /* check for a supported container */
+diff -ur libdlna-0.2.4.orig/src/av_mpeg4_part2.c libdlna-0.2.4/src/av_mpeg4_part2.c
+--- libdlna-0.2.4.orig/src/av_mpeg4_part2.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/av_mpeg4_part2.c 2016-02-17 21:45:27.494440471 +0000
+@@ -42,13 +42,13 @@
+ int codec_id;
+ mpeg4_vcodec_type_t type;
+ } avf_vcodec_mapping[] = {
+- { CODEC_ID_H263, MPEG4_VCODEC_H263 },
+- { CODEC_ID_H263I, MPEG4_VCODEC_H263 },
+- { CODEC_ID_H263P, MPEG4_VCODEC_H263 },
+- { CODEC_ID_MPEG4, MPEG4_VCODEC_P2 },
+- { CODEC_ID_MSMPEG4V1, MPEG4_VCODEC_P2 },
+- { CODEC_ID_MSMPEG4V2, MPEG4_VCODEC_P2 },
+- { CODEC_ID_MSMPEG4V3, MPEG4_VCODEC_P2 },
++ { AV_CODEC_ID_H263, MPEG4_VCODEC_H263 },
++ { AV_CODEC_ID_H263I, MPEG4_VCODEC_H263 },
++ { AV_CODEC_ID_H263P, MPEG4_VCODEC_H263 },
++ { AV_CODEC_ID_MPEG4, MPEG4_VCODEC_P2 },
++ { AV_CODEC_ID_MSMPEG4V1, MPEG4_VCODEC_P2 },
++ { AV_CODEC_ID_MSMPEG4V2, MPEG4_VCODEC_P2 },
++ { AV_CODEC_ID_MSMPEG4V3, MPEG4_VCODEC_P2 },
+ { -1, 0 }
+ };
+
+diff -ur libdlna-0.2.4.orig/src/av_wmv9.c libdlna-0.2.4/src/av_wmv9.c
+--- libdlna-0.2.4.orig/src/av_wmv9.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/av_wmv9.c 2016-02-17 21:45:27.494440471 +0000
+@@ -245,7 +245,7 @@
+ return NULL;
+
+ /* check for WMV3 (Simple and Main profiles) video codec */
+- if (codecs->vc->codec_id != CODEC_ID_WMV3)
++ if (codecs->vc->codec_id != AV_CODEC_ID_WMV3)
+ return NULL;
+
+ /* get video profile */
+diff -ur libdlna-0.2.4.orig/src/image_jpeg.c libdlna-0.2.4/src/image_jpeg.c
+--- libdlna-0.2.4.orig/src/image_jpeg.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/image_jpeg.c 2016-02-17 21:45:27.494440471 +0000
+@@ -92,10 +92,10 @@
+ return NULL;
+
+ /* check for JPEG compliant codec */
+- if (codecs->vc->codec_id != CODEC_ID_MJPEG &&
+- codecs->vc->codec_id != CODEC_ID_MJPEGB &&
+- codecs->vc->codec_id != CODEC_ID_LJPEG &&
+- codecs->vc->codec_id != CODEC_ID_JPEGLS)
++ if (codecs->vc->codec_id != AV_CODEC_ID_MJPEG &&
++ codecs->vc->codec_id != AV_CODEC_ID_MJPEGB &&
++ codecs->vc->codec_id != AV_CODEC_ID_LJPEG &&
++ codecs->vc->codec_id != AV_CODEC_ID_JPEGLS)
+ return NULL;
+
+ for (i = 0; jpeg_profiles_mapping[i].profile; i++)
+diff -ur libdlna-0.2.4.orig/src/image_png.c libdlna-0.2.4/src/image_png.c
+--- libdlna-0.2.4.orig/src/image_png.c 2016-02-17 21:45:09.864497986 +0000
++++ libdlna-0.2.4/src/image_png.c 2016-02-17 21:45:27.494440471 +0000
+@@ -76,7 +76,7 @@
+ return NULL;
+
+ /* check for PNG compliant codec */
+- if (codecs->vc->codec_id != CODEC_ID_PNG)
++ if (codecs->vc->codec_id != AV_CODEC_ID_PNG)
+ return NULL;
+
+ for (i = 0; png_profiles_mapping[i].profile; i++)