[SCM] faac/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 1f1036efc45dd0bf3cb718a6897daf33491bef90
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Tue Nov 11 09:31:59 2014 +0100

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

diff --git a/debian/control b/debian/control
index 032f37f..9ea8cbe 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,8 @@ Description: AAC audio encoder (library)
  metadata tags. The codecs are compatible with standard-compliant audio
  applications using one or more of these profiles.
  .
- This package contains the shared library.
+ This package contains the shared library and an extra
+ library with support for Digital Radio Mondiale (DRM).
 
 Package: libfaac-dev
 Section: non-free/libdevel
diff --git a/debian/libfaac0.symbols b/debian/libfaac0.symbols
index a839e9d..6c55fd4 100644
--- a/debian/libfaac0.symbols
+++ b/debian/libfaac0.symbols
@@ -6,3 +6,11 @@ libfaac.so.0 libfaac0 #MINVER#
  faacEncGetVersion at Base 1.28
  faacEncOpen at Base 1.28
  faacEncSetConfiguration at Base 1.28
+libfaac_drm.so.0 libfaac0 #MINVER#
+ faacEncClose at Base 1.28-7~
+ faacEncEncode at Base 1.28-7~
+ faacEncGetCurrentConfiguration at Base 1.28-7~
+ faacEncGetDecoderSpecificInfo at Base 1.28-7~
+ faacEncGetVersion at Base 1.28-7~
+ faacEncOpen at Base 1.28-7~
+ faacEncSetConfiguration at Base 1.28-7~
diff --git a/debian/patches/libfaac_drm.patch b/debian/patches/libfaac_drm.patch
new file mode 100644
index 0000000..f981e1c
--- /dev/null
+++ b/debian/patches/libfaac_drm.patch
@@ -0,0 +1,27 @@
+Author: Julian Cable <julian.cable at yahoo.com>
+Description: build the DRM version of the library as well as the normal version
+
+--- a/libfaac/Makefile.am
++++ b/libfaac/Makefile.am
+@@ -1,14 +1,15 @@
+-lib_LTLIBRARIES = libfaac.la
++lib_LTLIBRARIES = libfaac.la libfaac_drm.la
+ 
+-main_SOURCES = aacquant.c bitstream.c fft.c frame.c midside.c psychkni.c util.c backpred.c channels.c filtbank.c huffman.c ltp.c tns.c
+-if USE_DRM
+-drm_SOURCES = kiss_fft/kiss_fftr.c kiss_fft/kiss_fft.c
+-endif
+-libfaac_la_SOURCES = $(main_SOURCES) $(drm_SOURCES)
++libfaac_la_SOURCES = aacquant.c bitstream.c fft.c frame.c midside.c psychkni.c util.c backpred.c channels.c filtbank.c huffman.c ltp.c tns.c
+ libfaac_la_INCLUDES = aacquant.h channels.h filtbank.h hufftab.h psych.h backpred.h coder.h frame.h midside.h tns.h bitstream.h fft.h huffman.h ltp.h util.h
+ libfaac_la_LIBADD = -lm
+ libfaac_la_CFLAGS = -fvisibility=hidden
+ 
++libfaac_drm_la_SOURCES = ${libfaac_la_SOURCES} kiss_fft/kiss_fftr.c kiss_fft/kiss_fft.c
++libfaac_drm_la_INCLUDES = ${libfaac_la_INCLUDES}
++libfaac_drm_la_LIBADD = ${libfaac_la_LIBADD}
++libfaac_drm_la_CFLAGS = ${libfaac_la_CFLAGS} -DDRM
++
+ INCLUDES = -I$(top_srcdir)/include
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9b1f093..94540e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ format-security.patch
 exposed-API.patch
 external-libmp4v2.patch
 external-libmp4v2_r479.patch
+libfaac_drm.patch

-- 
faac packaging