From b476b0fd8b50adce60b990ae90a4ddd9d40b24f0 Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Mon, 13 Sep 2021 13:40:38 +0900 Subject: [PATCH] Fix for tizen - Add missing merged code (flac disabling, ogg dlopen handle) - Enable opus to enable experimental feature - Remove unwanted merged file (src/Makefile.am) - Add missing merged code (Makefile.am) - Remove unnecessary packaging/ files Change-Id: I9669b7acb4edf67a6458ac0c58b3785d90d1a991 --- Makefile.am | 45 ++++---------------------------------------- configure.ac | 27 +++++++++++--------------- packaging/baselibs.conf | 2 -- packaging/libsndfile.changes | 3 --- packaging/libsndfile.spec | 10 +++++----- src/common.h | 1 - src/ogg_vorbis.c | 4 ++++ src/wav.c | 4 ---- 8 files changed, 24 insertions(+), 72 deletions(-) delete mode 100644 packaging/baselibs.conf delete mode 100644 packaging/libsndfile.changes diff --git a/Makefile.am b/Makefile.am index 0b8bfa1..7500d0d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,8 +46,6 @@ SYMBOL_FILES = src/Symbols.gnu-binutils src/Symbols.darwin src/libsndfile-1.def EXTRA_DIST += include/sndfile.h.in src/config.h.in src/test_endswap.tpl src/test_endswap.def \ $(SYMBOL_FILES) src/create_symbols_file.py src/binheader_writef_check.py \ - src/GSM610/README src/GSM610/COPYRIGHT src/GSM610/ChangeLog \ - src/G72x/README src/G72x/README.original src/G72x/ChangeLog \ src/make-static-lib-hidden-privates.sh \ src/config.h.cmake @@ -65,22 +63,22 @@ nodist_include_HEADERS = include/sndfile.h src_libsndfile_la_CFLAGS = $(EXTERNAL_XIPH_CFLAGS) # MinGW requires -no-undefined if a DLL is to be built. src_libsndfile_la_LDFLAGS = -no-undefined -version-info $(SHARED_VERSION_INFO) $(SHLIB_VERSION_ARG) -src_libsndfile_la_SOURCES = src/sndfile.c src/aiff.c src/au.c src/avr.c src/caf.c src/dwd.c src/flac.c src/g72x.c src/htk.c src/ircam.c \ +src_libsndfile_la_SOURCES = src/sndfile.c src/aiff.c src/au.c src/avr.c src/dwd.c src/flac.c src/htk.c src/ircam.c \ src/macos.c src/mat4.c src/mat5.c src/nist.c src/paf.c src/pvf.c src/raw.c src/rx2.c src/sd2.c \ src/sds.c src/svx.c src/txw.c src/voc.c src/wve.c src/w64.c src/wavlike.c src/wav.c src/xi.c src/mpc2k.c src/rf64.c \ src/ogg_vorbis.c src/ogg_speex.c src/ogg_pcm.c src/ogg_opus.c src/ogg_vcomment.c \ src/common.h src/sfconfig.h src/sfendian.h src/wavlike.h src/sf_unistd.h src/ogg.h src/chanmap.h src/ogg_vcomment.h nodist_src_libsndfile_la_SOURCES = $(nodist_include_HEADERS) -src_libsndfile_la_LIBADD = src/GSM610/libgsm.la src/G72x/libg72x.la src/ALAC/libalac.la \ +src_libsndfile_la_LIBADD = \ src/libcommon.la $(EXTERNAL_XIPH_LIBS) -lm EXTRA_src_libsndfile_la_DEPENDENCIES = $(SYMBOL_FILES) noinst_LTLIBRARIES = src/libcommon.la src_libcommon_la_CFLAGS = $(EXTERNAL_XIPH_CFLAGS) src_libcommon_la_SOURCES = src/common.c src/file_io.c src/command.c src/pcm.c src/ulaw.c src/alaw.c \ - src/float32.c src/double64.c src/ima_adpcm.c src/ms_adpcm.c src/gsm610.c src/dwvw.c src/vox_adpcm.c \ + src/float32.c src/double64.c src/ima_adpcm.c src/ms_adpcm.c src/dwvw.c src/vox_adpcm.c \ src/interleave.c src/strings.c src/dither.c src/cart.c src/broadcast.c src/audio_detect.c \ - src/ima_oki_adpcm.c src/ima_oki_adpcm.h src/alac.c src/chunk.c src/ogg.c src/chanmap.c \ + src/ima_oki_adpcm.c src/ima_oki_adpcm.h src/chunk.c src/ogg.c src/chanmap.c \ src/windows.c src/id3.c src/nms_adpcm.c $(WIN_VERSION_FILE) check_PROGRAMS = src/test_main @@ -90,41 +88,6 @@ src_test_main_SOURCES = src/test_main.c src/test_main.h src/test_conversions.c s src/test_binheader_writef.c src/test_nms_adpcm.c src_test_main_LDADD = src/libcommon.la -############## -# src/GSM610 # -############## - -noinst_LTLIBRARIES += src/GSM610/libgsm.la -src_GSM610_libgsm_la_SOURCES = src/GSM610/config.h src/GSM610/gsm.h src/GSM610/gsm610_priv.h \ - src/GSM610/add.c src/GSM610/code.c src/GSM610/decode.c src/GSM610/gsm_create.c \ - src/GSM610/gsm_decode.c src/GSM610/gsm_destroy.c src/GSM610/gsm_encode.c \ - src/GSM610/gsm_option.c src/GSM610/long_term.c src/GSM610/lpc.c src/GSM610/preprocess.c \ - src/GSM610/rpe.c src/GSM610/short_term.c src/GSM610/table.c - -############ -# src/G72x # -############ - -noinst_LTLIBRARIES += src/G72x/libg72x.la -src_G72x_libg72x_la_SOURCES = src/G72x/g72x.h src/G72x/g72x_priv.h \ - src/G72x/g721.c src/G72x/g723_16.c src/G72x/g723_24.c src/G72x/g723_40.c src/G72x/g72x.c - -check_PROGRAMS += src/G72x/g72x_test -src_G72x_g72x_test_SOURCES = src/G72x/g72x_test.c -src_G72x_g72x_test_LDADD = src/G72x/libg72x.la - -############ -# src/ALAC # -############ - -noinst_LTLIBRARIES += src/ALAC/libalac.la -src_ALAC_libalac_la_SOURCES = src/ALAC/ALACAudioTypes.h src/ALAC/ALACBitUtilities.h \ - src/ALAC/EndianPortable.h src/ALAC/aglib.h src/ALAC/dplib.h src/ALAC/matrixlib.h \ - src/ALAC/alac_codec.h src/ALAC/shift.h \ - src/ALAC/ALACBitUtilities.c src/ALAC/ag_dec.c \ - src/ALAC/ag_enc.c src/ALAC/dp_dec.c src/ALAC/dp_enc.c src/ALAC/matrix_dec.c \ - src/ALAC/matrix_enc.c src/ALAC/alac_decoder.c src/ALAC/alac_encoder.c - #=============================================================================== # Generate an OS specific Symbols files. This is done when the author # builds the distribution tarball. There should be not need for the diff --git a/configure.ac b/configure.ac index 78a79da..c66db42 100644 --- a/configure.ac +++ b/configure.ac @@ -145,7 +145,7 @@ AC_ARG_ENABLE([alsa], [AS_HELP_STRING([--disable-alsa], [disable ALSA support (default=autodetect)])], [], [enable_alsa=auto]) AC_ARG_ENABLE([external-libs], - [AS_HELP_STRING([--disable-external-libs], [disable use of FLAC, Ogg and Vorbis [[default=no]]])]) + [AS_HELP_STRING([--disable-external-libs], [disable use of Ogg and Vorbis [[default=no]]])]) AC_ARG_ENABLE(octave, [AS_HELP_STRING([--enable-octave], [enable building of GNU Octave module])]) @@ -321,7 +321,7 @@ AS_IF([test "x$cross_compiling" = "xno"], [ ]) dnl ==================================================================================== -dnl Check for Ogg, Vorbis and FLAC. +dnl Check for Ogg, Vorbis. HAVE_EXTERNAL_XIPH_LIBS=0 EXTERNAL_XIPH_CFLAGS="" @@ -335,13 +335,8 @@ PKG_INSTALLDIR AS_IF([test -n "$PKG_CONFIG"], [ AS_IF([test "x$enable_external_libs" = "xno"], [ - AC_MSG_WARN([[*** External libs (FLAC, Ogg, Vorbis) disabled. ***]]) + AC_MSG_WARN([[*** External libs (Ogg, Vorbis) disabled. ***]]) ], [ - PKG_CHECK_MOD_VERSION(FLAC, flac >= 1.3.1, ac_cv_flac=yes, ac_cv_flac=no) - - dnl Make sure the FLAC_CFLAGS value is sane. - FLAC_CFLAGS=`echo $FLAC_CFLAGS | $SED "s|include/FLAC|include|"` - PKG_CHECK_MOD_VERSION(OGG, ogg >= 1.3.0, ac_cv_ogg=yes, ac_cv_ogg=no) AS_IF([test "x$enable_experimental" = "xyes"], [ @@ -361,20 +356,20 @@ AS_IF([test -n "$PKG_CONFIG"], [ enable_external_libs=yes ]) - AS_IF([test "x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc$ac_cv_opus" = "xyesyesyesyesyes"], [ + AS_IF([test "x$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc$ac_cv_opus" = "xyesyesyesyes"], [ HAVE_EXTERNAL_XIPH_LIBS=1 enable_external_libs=yes - EXTERNAL_XIPH_CFLAGS="$FLAC_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS $OPUS_CFLAGS $OGG_CFLAGS " - EXTERNAL_XIPH_LIBS="$FLAC_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS $OPUS_LIBS $OGG_LIBS " - EXTERNAL_XIPH_REQUIRE="flac ogg vorbis vorbisenc opus" + EXTERNAL_XIPH_CFLAGS="$VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS $OPUS_CFLAGS $OGG_CFLAGS " + EXTERNAL_XIPH_LIBS="$VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS $OPUS_LIBS $OGG_LIBS " + EXTERNAL_XIPH_REQUIRE="ogg vorbis vorbisenc opus" if test x$ac_cv_speex = "xyes" ; then EXTERNAL_XIPH_REQUIRE="$EXTERNAL_XIPH_REQUIRE speex" fi ], [ AS_ECHO([""]) - AC_MSG_WARN([[*** One or more of the external libraries (ie libflac, libogg and]]) + AC_MSG_WARN([[*** One or more of the external libraries (ie libogg and]]) AC_MSG_WARN([[*** libvorbis) is either missing (possibly only the development]]) AC_MSG_WARN([[*** headers) or is of an unsupported version.]]) AC_MSG_WARN([[***]]) @@ -385,7 +380,7 @@ AS_IF([test -n "$PKG_CONFIG"], [ ]) ]) -AC_DEFINE_UNQUOTED([HAVE_EXTERNAL_XIPH_LIBS], [$HAVE_EXTERNAL_XIPH_LIBS], [Will be set to 1 if flac, ogg, vorbis, and opus are available.]) +AC_DEFINE_UNQUOTED([HAVE_EXTERNAL_XIPH_LIBS], [$HAVE_EXTERNAL_XIPH_LIBS], [Will be set to 1 if ogg, vorbis, and opus are available.]) dnl ==================================================================================== dnl Check for libsqlite3 (only used in regtest). @@ -689,7 +684,7 @@ dnl ============================================================================ AS_IF([test -z "$PKG_CONFIG"], [ AS_ECHO([" *****************************************************************"]) AS_ECHO([" *** The pkg-config program is missing. ***"]) - AS_ECHO([" *** External FLAC/Ogg/Vorbis libs cannot be found without it. ***"]) + AS_ECHO([" *** External Ogg/Vorbis libs cannot be found without it. ***"]) AS_ECHO([" *** http://pkg-config.freedesktop.org/wiki/ ***"]) AS_ECHO([" *****************************************************************"]) ]) @@ -716,7 +711,7 @@ AC_MSG_RESULT([ Experimental code : ................... ${enable_experimental:-no} Using ALSA in example programs : ...... ${enable_alsa:-no} - External FLAC/Ogg/Vorbis/Opus : ....... ${enable_external_libs:-no} + External Ogg/Vorbis/Opus : ............ ${enable_external_libs:-no} Building Octave interface : ........... ${OCTAVE_BUILD} Tools : diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf deleted file mode 100644 index 687c0d5..0000000 --- a/packaging/baselibs.conf +++ /dev/null @@ -1,2 +0,0 @@ -libsndfile - provides "libsndfile- = " diff --git a/packaging/libsndfile.changes b/packaging/libsndfile.changes deleted file mode 100644 index ea21736..0000000 --- a/packaging/libsndfile.changes +++ /dev/null @@ -1,3 +0,0 @@ -* Mon Mar 18 2013 Anas Nashif upstream/1.0.25@7ea32ba -- Fixed package groups - diff --git a/packaging/libsndfile.spec b/packaging/libsndfile.spec index d802b37..4042929 100644 --- a/packaging/libsndfile.spec +++ b/packaging/libsndfile.spec @@ -1,7 +1,7 @@ %define __spec_check_pre exit 0 Name: libsndfile -Version: 1.0.28 -Release: 2 +Version: 1.0.31 +Release: 0 License: LGPL-2.1+ Summary: C library for reading and writing sound files Group: Multimedia/Audio @@ -9,11 +9,12 @@ BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: python BuildRequires: pkg-config +BuildRequires: autogen BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(vorbis) -Url: http://www.mega-nerd.com/libsndfile/ +BuildRequires: pkgconfig(opus) +Url: https://github.com/libsndfile/libsndfile Source: libsndfile-%{version}.tar.gz -Source2: baselibs.conf Source1001: libsndfile.manifest %description @@ -62,7 +63,6 @@ popd rm -rf %{buildroot}%{_bindir} rm -rf %{buildroot}%{_mandir}/man1 # remove binaries from examples directory -make -C examples distclean rm -rf %{buildroot}%{_datadir}/doc/libsndfile %post -p /sbin/ldconfig diff --git a/src/common.h b/src/common.h index 199ed8f..d8a0adf 100644 --- a/src/common.h +++ b/src/common.h @@ -939,7 +939,6 @@ int alaw_init (SF_PRIVATE *psf) ; int float32_init (SF_PRIVATE *psf) ; int double64_init (SF_PRIVATE *psf) ; int dwvw_init (SF_PRIVATE *psf, int bitwidth) ; -int gsm610_init (SF_PRIVATE *psf) ; int nms_adpcm_init (SF_PRIVATE *psf) ; int vox_adpcm_init (SF_PRIVATE *psf) ; int flac_init (SF_PRIVATE *psf) ; diff --git a/src/ogg_vorbis.c b/src/ogg_vorbis.c index 0bd6efe..e6879a0 100644 --- a/src/ogg_vorbis.c +++ b/src/ogg_vorbis.c @@ -147,6 +147,10 @@ typedef struct uint64_t pcm_end ; /* File offset of the start of the last page. */ sf_count_t last_page ; +#ifdef __TIZEN__ + /* func ptr for encoder */ + void *dl; +#endif } VORBIS_PRIVATE ; static int diff --git a/src/wav.c b/src/wav.c index 6d93935..9b4c158 100644 --- a/src/wav.c +++ b/src/wav.c @@ -258,10 +258,6 @@ wav_open (SF_PRIVATE *psf) error = wavlike_msadpcm_init (psf, blockalign, framesperblock) ; break ; - case SF_FORMAT_G721_32 : - error = g72x_init (psf) ; - break ; - case SF_FORMAT_NMS_ADPCM_16 : case SF_FORMAT_NMS_ADPCM_24 : case SF_FORMAT_NMS_ADPCM_32 : -- 2.7.4