Commit a53ff378 authored by Thomas Guillem's avatar Thomas Guillem

codec: move libliba52_plugin to liba52_plugin

parent 25977de3
......@@ -2683,13 +2683,13 @@ then
CPPFLAGS_test="-I${with_a52}/include"
fi
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_test} ${CPPFLAGS_liba52}"
LDFLAGS="${LDFLAGS} ${LDFLAGS_test} ${LIBS_liba52}"
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_test} ${CPPFLAGS_a52}"
LDFLAGS="${LDFLAGS} ${LDFLAGS_test} ${LIBS_a52}"
AC_CHECK_HEADERS(a52dec/a52.h, [
AC_CHECK_LIB(a52, a52_free, [
VLC_ADD_PLUGIN([liba52])
VLC_ADD_LIBS([liba52],[${LDFLAGS_test} -la52])
VLC_ADD_CPPFLAGS([liba52],[${CPPFLAGS_test}])
VLC_ADD_PLUGIN([a52])
VLC_ADD_LIBS([a52],[${LDFLAGS_test} -la52])
VLC_ADD_CPPFLAGS([a52],[${CPPFLAGS_test}])
],[
AC_MSG_ERROR([Could not find liba52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin.])
], [$LIBM])
......
......@@ -1315,7 +1315,7 @@ strfile %buildroot%_gamesdatadir/fortune/vlc %buildroot%_gamesdatadir/fortune/vl
%_vlc_pluginsdir/codec/libflac_plugin.so*
%files plugin-a52
%_vlc_pluginsdir/codec/libliba52_plugin.so*
%_vlc_pluginsdir/codec/liba52_plugin.so*
%files plugin-h264
%_vlc_pluginsdir/codec/libx264_plugin.so*
......
List of vlc plugins (475)
$Id$
* a52: A/52 audio decoder plugin, using liba52
* aa: Ascii art video output
* access_alsa: Alsa access module
* access_archive: libarchive based access and stream filter
......@@ -207,7 +208,6 @@ $Id$
* keychain: Keystore for iOS, Mac OS X and tvOS
* kva: OS/2 video output
* kwallet: store secrets via KDE Kwallet
* liba52: A/52 audio decoder plugin, using liba52
* libass: Subtitle renderers using libass
* libbluray: Library to access Blu-Ray drives
* libmpeg2: Mpeg2 video decoder using libmpeg2
......
......@@ -16,12 +16,12 @@ endif
libspdif_plugin_la_SOURCES = codec/spdif.c
codec_LTLIBRARIES += libspdif_plugin.la
libliba52_plugin_la_SOURCES = codec/liba52.c
libliba52_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_liba52)
libliba52_plugin_la_LIBADD = $(LIBM) $(LIBS_liba52)
libliba52_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
EXTRA_LTLIBRARIES += libliba52_plugin.la
codec_LTLIBRARIES += $(LTLIBliba52)
liba52_plugin_la_SOURCES = codec/a52.c
liba52_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_a52)
liba52_plugin_la_LIBADD = $(LIBM) $(LIBS_a52)
liba52_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
EXTRA_LTLIBRARIES += liba52_plugin.la
codec_LTLIBRARIES += $(LTLIBa52)
libdca_plugin_la_SOURCES = codec/dca.c
libdca_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DCA_CFLAGS)
......
/*****************************************************************************
* liba52.c: ATSC A/52 aka AC-3 decoder plugin for VLC.
* a52.c: ATSC A/52 aka AC-3 decoder plugin for VLC.
* This plugin makes use of liba52 to decode A/52 audio
* (http://liba52.sf.net/).
*****************************************************************************
......
......@@ -330,6 +330,7 @@ modules/audio_output/volume.h
modules/audio_output/wasapi.c
modules/audio_output/waveout.c
modules/audio_output/windows_audio_common.h
modules/codec/a52.c
modules/codec/adpcm.c
modules/codec/aes3.c
modules/codec/aom.c
......@@ -369,7 +370,6 @@ modules/codec/gstreamer/gstdecode.c
modules/codec/jpeg.c
modules/codec/kate.c
modules/codec/libass.c
modules/codec/liba52.c
modules/codec/libmpeg2.c
modules/codec/lpcm.c
modules/codec/mft.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment