vlc | branch: master | Thomas Guillem <[email protected]> | Mon Oct 10 15:58:32 2016 +0200| [a53ff3785f084834b554d8a5a21c0d668884c146] | committer: Thomas Guillem
codec: move libliba52_plugin to liba52_plugin > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a53ff3785f084834b554d8a5a21c0d668884c146 --- configure.ac | 10 +++++----- extras/package/rpm/vlc.altlinux.spec | 2 +- modules/MODULES_LIST | 2 +- modules/codec/Makefile.am | 12 ++++++------ modules/codec/{liba52.c => a52.c} | 2 +- po/POTFILES.in | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 025170f..83a7fd3 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) diff --git a/extras/package/rpm/vlc.altlinux.spec b/extras/package/rpm/vlc.altlinux.spec index 6c011b1..c66bc3d 100644 --- a/extras/package/rpm/vlc.altlinux.spec +++ b/extras/package/rpm/vlc.altlinux.spec @@ -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* diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST index 696412f..cf87b64 100644 --- a/modules/MODULES_LIST +++ b/modules/MODULES_LIST @@ -1,5 +1,6 @@ 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 diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am index c42473b..bf7e9e1 100644 --- a/modules/codec/Makefile.am +++ b/modules/codec/Makefile.am @@ -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) diff --git a/modules/codec/liba52.c b/modules/codec/a52.c similarity index 99% rename from modules/codec/liba52.c rename to modules/codec/a52.c index 880cb18..0c21def 100644 --- a/modules/codec/liba52.c +++ b/modules/codec/a52.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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/). ***************************************************************************** diff --git a/po/POTFILES.in b/po/POTFILES.in index c603e54..f4ef504 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -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 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
