[vlc-devel] [PATCH v2 3/3] Add CineForm plugin to the build system

[Rémi Denis-Courmont]

Le tiistaina 21. marraskuuta 2017, 11.41.07 EET Emeric Grange a écrit :
> ---
>  configure.ac                       |  5 +++++
>  extras/package/macosx/configure.sh |  1 +
>  modules/codec/Makefile.am          | 13 +++++++++++++
>  3 files changed, 19 insertions(+)
> 
> diff --git a/configure.ac b/configure.ac
> index d9ce412e5e..67ddcc7d06 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2639,6 +2639,11 @@ AS_IF([test "${enable_vpx}" != "no"],[
>      ])])
>  ])
> 
> +dnl
> +dnl  cineformsdk
> +dnl
> +PKG_ENABLE_MODULES_VLC([CINEFORMSDK], [], [libcineformsdk >= 10.0.1],
> [CineForm SDK with encoder and decoder], [auto])
> +
>  dnl
>  dnl twolame encoder plugin
>  dnl
> diff --git a/extras/package/macosx/configure.sh
> b/extras/package/macosx/configure.sh index 2ba0c75769..ef57b1b4f1 100755
> --- a/extras/package/macosx/configure.sh
> +++ b/extras/package/macosx/configure.sh
> @@ -29,6 +29,7 @@ OPTIONS="
>          --enable-libass
>          --enable-macosx-qtkit
>          --enable-macosx-avfoundation
> +        --enable-cineformsdk

AFAICT, this is pointless.

>          --disable-skins2
>          --disable-xcb
>          --disable-caca
> diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
> index 075ee2a0e9..70814ae335 100644
> --- a/modules/codec/Makefile.am
> +++ b/modules/codec/Makefile.am
> @@ -124,6 +124,19 @@ EXTRA_LTLIBRARIES += libschroedinger_plugin.la
>  codec_LTLIBRARIES += $(LTLIBschroedinger)
> 
> 
> +libcineformsdk_plugin_la_SOURCES = dummy.cpp \

No. This will cause extraneous deps.

> +	codec/cineformsdk/cineform_plugin.c codec/cineformsdk/cineform_plugin.h \
> +	codec/cineformsdk/cineform_allocator.c
> codec/cineformsdk/cineform_allocator.h \
> +	codec/cineformsdk/cineform_debug.c codec/cineformsdk/cineform_debug.h \
> +	codec/cineformsdk/cineform_settings.c
> codec/cineformsdk/cineform_settings.h +libcineformsdk_plugin_la_CFLAGS =
> $(AM_CFLAGS) $(CFLAGS_cineformsdk) +libcineformsdk_plugin_la_CPPFLAGS =
> $(AM_CPPFLAGS) $(CFLAGS_cineformsdk) +libcineformsdk_plugin_la_LDFLAGS =
> $(AM_LDFLAGS) -rpath '$(codecdir)' +libcineformsdk_plugin_la_LIBADD =
> $(LIBS_cineformsdk)
> +EXTRA_LTLIBRARIES += libcineformsdk_plugin.la
> +codec_LTLIBRARIES += $(LTLIBcineformsdk)
> +
> +
>  ### Image codecs ###
> 
>  libpng_plugin_la_SOURCES = codec/png.c

And the rest should squashed.

-- 
雷米‧德尼-库尔蒙
https://www.remlab.net/