[packages/libdlna] - fix building with ffmpeg 3 - rel 5
baggins
baggins at pld-linux.org
Thu Mar 31 15:31:27 CEST 2016
commit ae76d4fafa7381999fb17de830f3045422655f08
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Mar 31 22:31:05 2016 +0900
- fix building with ffmpeg 3
- rel 5
ffmpeg3.patch | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
libdlna.spec | 4 +-
2 files changed, 235 insertions(+), 1 deletion(-)
---
diff --git a/libdlna.spec b/libdlna.spec
index 457d410..a7b6ea3 100644
--- a/libdlna.spec
+++ b/libdlna.spec
@@ -2,12 +2,13 @@ Summary: DLNA library
Summary(pl.UTF-8): Biblioteka DLNA
Name: libdlna
Version: 0.2.4
-Release: 4
+Release: 5
License: LGPL v2.1+
Group: Libraries
Source0: http://libdlna.geexbox.org/releases/%{name}-%{version}.tar.bz2
# Source0-md5: 64d7de57aff5a729f2434fc5e69b4ffc
Patch0: %{name}-ffmpeg.patch
+Patch1: ffmpeg3.patch
URL: http://libdlna.geexbox.org/
# libavformat, libavcodec
BuildRequires: ffmpeg-devel
@@ -50,6 +51,7 @@ Statyczna biblioteka libdlna.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
# not autoconf-generated
diff --git a/ffmpeg3.patch b/ffmpeg3.patch
new file mode 100644
index 0000000..774a5bb
--- /dev/null
+++ b/ffmpeg3.patch
@@ -0,0 +1,232 @@
+--- libdlna-0.2.4/src/image_jpeg.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/image_jpeg.c 2016-03-31 22:24:52.501661042 +0900
+@@ -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++)
+--- libdlna-0.2.4/src/image_png.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/image_png.c 2016-03-31 22:25:16.401600453 +0900
+@@ -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++)
+--- libdlna-0.2.4/src/audio_aac.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/audio_aac.c 2016-03-31 22:25:46.924900012 +0900
+@@ -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)
+--- libdlna-0.2.4/src/audio_ac3.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/audio_ac3.c 2016-03-31 22:26:04.098234868 +0900
+@@ -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 */
+--- libdlna-0.2.4/src/audio_amr.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/audio_amr.c 2016-03-31 22:26:20.471582856 +0900
+@@ -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 */
+--- libdlna-0.2.4/src/audio_atrac3.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/audio_atrac3.c 2016-03-31 22:26:33.571603577 +0900
+@@ -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
+
+--- libdlna-0.2.4/src/audio_g726.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/audio_g726.c 2016-03-31 22:26:46.398298072 +0900
+@@ -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)
+--- libdlna-0.2.4/src/audio_lpcm.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/audio_lpcm.c 2016-03-31 22:27:02.865011102 +0900
+@@ -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 */
+--- libdlna-0.2.4/src/audio_mp2.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/audio_mp2.c 2016-03-31 22:27:16.078390054 +0900
+@@ -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)
+--- libdlna-0.2.4/src/audio_mp3.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/audio_mp3.c 2016-03-31 22:27:27.028433386 +0900
+@@ -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 */
+--- libdlna-0.2.4/src/audio_wma.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/audio_wma.c 2016-03-31 22:27:46.931857953 +0900
+@@ -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)
+--- libdlna-0.2.4/src/av_mpeg1.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/av_mpeg1.c 2016-03-31 22:28:05.788625423 +0900
+@@ -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 */
+--- libdlna-0.2.4/src/av_mpeg2.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/av_mpeg2.c 2016-03-31 22:28:24.478738621 +0900
+@@ -453,7 +453,7 @@
+ int i;
+
+ /* check for MPEG-2 MP at 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)
+--- libdlna-0.2.4/src/av_mpeg4_part2.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/av_mpeg4_part2.c 2016-03-31 22:28:54.748948800 +0900
+@@ -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 }
+ };
+
+--- libdlna-0.2.4/src/av_mpeg4_part10.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/av_mpeg4_part10.c 2016-03-31 22:29:10.892407233 +0900
+@@ -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 */
+--- libdlna-0.2.4/src/av_wmv9.c~ 2012-02-27 04:34:00.000000000 +0900
++++ libdlna-0.2.4/src/av_wmv9.c 2016-03-31 22:29:26.339201742 +0900
+@@ -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 */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libdlna.git/commitdiff/ae76d4fafa7381999fb17de830f3045422655f08
More information about the pld-cvs-commit
mailing list