[SCM] faad2/master: build the DRM version of the library as well as the normal version

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 64a9870d09768cd132675a876a86ddf95c6866b7
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Tue Nov 11 06:54:04 2014 +0100

    build the DRM version of the library as well as the normal version

diff --git a/debian/control b/debian/control
index 4d6fab1..de8983f 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,8 @@ Description: freeware Advanced Audio Decoder - runtime files
  decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC
  files.
  .
- This package contains the shared library.
+ This package contains the shared library and an extra
+ library with support for Digital Radio Mondiale (DRM).
 
 Package: faad2-dbg
 Architecture: any
diff --git a/debian/libfaad2.symbols b/debian/libfaad2.symbols
index 01bf618..052fd48 100644
--- a/debian/libfaad2.symbols
+++ b/debian/libfaad2.symbols
@@ -11,3 +11,17 @@ libfaad.so.2 libfaad2 #MINVER#
  NeAACDecOpen at Base 2.7
  NeAACDecPostSeekReset at Base 2.7
  NeAACDecSetConfiguration at Base 2.7
+libfaad_drm.so.2 libfaad2 #MINVER#
+ NeAACDecAudioSpecificConfig at Base 2.7-8~
+ NeAACDecClose at Base 2.7-8~
+ NeAACDecDecode2 at Base 2.7-8~
+ NeAACDecDecode at Base 2.7-8~
+ NeAACDecGetCapabilities at Base 2.7-8~
+ NeAACDecGetCurrentConfiguration at Base 2.7-8~
+ NeAACDecGetErrorMessage at Base 2.7-8~
+ NeAACDecInit2 at Base 2.7-8~
+ NeAACDecInit at Base 2.7-8~
+ NeAACDecInitDRM at Base 2.7-8~
+ NeAACDecOpen at Base 2.7-8~
+ NeAACDecPostSeekReset at Base 2.7-8~
+ NeAACDecSetConfiguration at Base 2.7-8~
diff --git a/debian/patches/libfaad-drm.patch b/debian/patches/libfaad-drm.patch
new file mode 100644
index 0000000..999e237
--- /dev/null
+++ b/debian/patches/libfaad-drm.patch
@@ -0,0 +1,20 @@
+Author: Julian Cable <julian_cable at yahoo.com>
+Description: build the DRM version of the library as well as the normal version
+
+--- a/libfaad/Makefile.am
++++ b/libfaad/Makefile.am
+@@ -1,4 +1,4 @@
+-lib_LTLIBRARIES = libfaad.la
++lib_LTLIBRARIES = libfaad.la libfaad_drm.la
+ 
+ INCLUDES	= -iquote $(top_srcdir)/include
+ include_HEADERS = $(top_srcdir)/include/faad.h \
+@@ -29,3 +29,8 @@ libfaad_la_SOURCES = bits.c cfft.c decod
+ 		     codebook/hcb_1.h codebook/hcb_2.h codebook/hcb_3.h codebook/hcb_4.h \
+ 		     codebook/hcb_5.h codebook/hcb_6.h codebook/hcb_7.h codebook/hcb_8.h \
+ 		     codebook/hcb_9.h codebook/hcb_10.h codebook/hcb_11.h codebook/hcb_sf.h
++
++libfaad_drm_la_LDFLAGS = ${libfaad_la_LDFLAGS}
++libfaad_drm_la_LIBADD = ${libfaad_la_LIBADD}
++libfaad_drm_la_CFLAGS = ${libfaad_la_CFLAGS} -DDRM -DDRM_PS
++libfaad_drm_la_SOURCES = ${libfaad_la_SOURCES}
diff --git a/debian/patches/series b/debian/patches/series
index 81f9044..c0a833f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ bpa-stdin.patch
 path_max.patch
 fix_ftbfs_with_gcc4.5.patch
 symbol-visibility.patch
+libfaad-drm.patch

-- 
faad2 packaging