diff options
| -rw-r--r-- | .gitignore | 11 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | project/cmake/modules/FindFFMPEG.cmake | 3 |
4 files changed, 2 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore index 359c841b97..873d3770c9 100644 --- a/.gitignore +++ b/.gitignore @@ -299,20 +299,9 @@ lib/cpluff/stamp-h1 /system/libxslt.dll /system/ssleay32.dll -# /system/cdrip -/system/cdrip/lame_enc.dll -/system/cdrip/ogg.dll -/system/cdrip/vorbis.dll -/system/cdrip/vorbisenc.dll - # /system/players/VideoPlayer /system/players/VideoPlayer/* -# /system/players/paplayer -/system/players/paplayer/vorbisfile.dll -/system/players/paplayer/adpcm.dll -/system/players/paplayer/libFLAC.dll - # /system /system/profiles.xml diff --git a/Makefile.in b/Makefile.in index 71d0d8f678..957fb92a09 100644 --- a/Makefile.in +++ b/Makefile.in @@ -393,7 +393,7 @@ FFMPEGOBJS = @FFMPEG_LIBDIR@/libavcodec.a \ @FFMPEG_LIBDIR@/libpostproc.a \ @FFMPEG_LIBDIR@/libswscale.a DYNOBJSXBMC+= $(FFMPEGOBJS) -LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ @DCADEC_ALL_LIBS@ +LIBS+= @GNUTLS_ALL_LIBS@ $(FFMPEGOBJS): dvdpcodecs endif diff --git a/configure.ac b/configure.ac index ec8250979e..4221e5b5a4 100644 --- a/configure.ac +++ b/configure.ac @@ -1588,7 +1588,6 @@ if test "${USE_STATIC_FFMPEG}" = "1"; then # get the libdir for static linking FFMPEG_LIBDIR=${pkg_cfg_prefix}$(PKG_CONFIG_SYSROOT_DIR="" ${PKG_CONFIG} --static --variable=libdir libavcodec) GNUTLS_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors gnutls) - VORBISENC_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors vorbisenc) # check if static libs are available for ff_lib in ${ff_libs}; do @@ -2267,8 +2266,6 @@ AC_SUBST(SDL_DEFINES) AC_SUBST(FFMPEG_LIBDIR) AC_SUBST(USE_STATIC_FFMPEG) AC_SUBST(GNUTLS_ALL_LIBS) -AC_SUBST(VORBISENC_ALL_LIBS) -AC_SUBST(DCADEC_ALL_LIBS) AC_SUBST(USE_LIBAV_HACKS) AC_SUBST(PYTHON_VERSION) AC_SUBST(OUTPUT_FILES) diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake index 7f8e37fc8a..caa70536bd 100644 --- a/project/cmake/modules/FindFFMPEG.cmake +++ b/project/cmake/modules/FindFFMPEG.cmake @@ -53,8 +53,7 @@ then swscale=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswscale` swresample=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswresample` gnutls=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors gnutls` - vorbisenc=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors vorbisenc` - $@ $avcodec $avformat $avcodec $avfilter $swscale $swresample -lpostproc $gnutls $vorbisenc + $@ $avcodec $avformat $avcodec $avfilter $swscale $swresample -lpostproc $gnutls else $@ fi") |