Permalink
Browse files

remove libsamplerate and related dead code

  • Loading branch information...
1 parent 619880f commit e36e4f0e2a46764d0c4341a5caf50cae6f772504 @FernetMenta FernetMenta committed May 1, 2014
View
@@ -1037,7 +1037,6 @@ AC_CHECK_HEADER([mpeg2dec/mpeg2convert.h],, AC_MSG_ERROR($missing_library),
AC_INCLUDES_DEFAULT()
[#include <mpeg2dec/mpeg2.h>])
AC_CHECK_HEADER([jpeglib.h],, AC_MSG_ERROR($missing_library))
-AC_CHECK_HEADER([samplerate.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([ogg/ogg.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([libmodplug/modplug.h],, AC_MSG_ERROR($missing_library))
@@ -1116,9 +1115,6 @@ PKG_CHECK_MODULES([PCRE], [libpcre],
[INCLUDES="$INCLUDES $PCRE_CFLAGS"; LIBS="$LIBS $PCRE_LIBS"]; \
AC_DEFINE([HAVE_LIBPCRE],[1],["Define to 1 if libpcre is installed"]),
AC_MSG_ERROR($missing_library))
-PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
- [INCLUDES="$INCLUDES $SAMPLERATE_CFLAGS"; LIBS="$LIBS $SAMPLERATE_LIBS"],
- AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([FREETYPE2], [freetype2],
[INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"],
AC_MSG_ERROR($missing_library))
@@ -1,14 +0,0 @@
-@ECHO OFF
-
-SET LOC_PATH=%CD%
-SET FILES=%LOC_PATH%\libsamplerate_d.txt
-
-CALL dlextract.bat libsamplerate %FILES%
-
-cd %TMP_PATH%
-
-copy include\samplerate.h "%CUR_PATH%\include" /Y
-copy lib\libsamplerate-0.lib "%CUR_PATH%\lib\" /Y
-copy bin\libsamplerate-0.dll "%XBMC_PATH%\system\" /Y
-
-cd %LOC_PATH%
@@ -1,3 +0,0 @@
-; filename mirror of the file source of the file
-libsamplerate-vc100-0.1.7-lib.tar.bz2 http://mirrors.xbmc.org/build-deps/win32/ http://winkde.org/pub/kde/ports/win32/releases/stable/4.5.4/libsamplerate-vc100-0.1.7-lib.tar.bz2
-libsamplerate-vc100-0.1.7-bin.tar.bz2 http://mirrors.xbmc.org/build-deps/win32/ http://winkde.org/pub/kde/ports/win32/releases/stable/4.5.4/libsamplerate-vc100-0.1.7-bin.tar.bz2
@@ -319,7 +319,6 @@
<ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AERemap.cpp" />
<ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEStreamInfo.cpp" />
<ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEUtil.cpp" />
- <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEWAVLoader.cpp" />
<ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.cpp" />
<ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\CrystalHD.cpp" />
<ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.cpp" />
@@ -997,7 +996,6 @@
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AERemap.h" />
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEStreamInfo.h" />
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEUtil.h" />
- <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEWAVLoader.h" />
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.h" />
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxBXA.h" />
<ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxCDDA.h" />
@@ -2355,9 +2355,6 @@
<ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEUtil.cpp">
<Filter>cores\AudioEngine\Utils</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEWAVLoader.cpp">
- <Filter>cores\AudioEngine\Utils</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEDeviceInfo.cpp">
<Filter>cores\AudioEngine\Utils</Filter>
</ClCompile>
@@ -5450,9 +5447,6 @@
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEUtil.h">
<Filter>cores\AudioEngine\Utils</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEWAVLoader.h">
- <Filter>cores\AudioEngine\Utils</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEDeviceInfo.h">
<Filter>cores\AudioEngine\Utils</Filter>
</ClInclude>
@@ -10,7 +10,7 @@ DEPENDS = \
openssl gmp nettle gnutls libssh2 curl \
libjpeg-turbo tiff jasper libpng \
libogg libvorbis libflac fribidi libmpeg2 \
- libass libsamplerate \
+ libass \
libmodplug librtmp libxml2 yajl libmicrohttpd mysql libffi \
python26 afpfs-ng libshairplay \
libplist libcec libbluray boost tinyxml dummy-libxbmc \
@@ -1,42 +0,0 @@
-include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile
-
-# lib name, version
-LIBNAME=libsamplerate
-VERSION=0.1.7
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-# configuration settings
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
- cp -f $(CONFIG_SUB) $(CONFIG_GUESS) Cfg; \
- ./configure --prefix=$(PREFIX) --disable-sndfile --disable-fftw --disable-shared
-
-LIBDYLIB=$(PLATFORM)/src/.libs/$(LIBNAME).a
-
-CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
- cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
- rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- cd $(PLATFORM); $(CONFIGURE)
-
-$(LIBDYLIB): $(PLATFORM)
- $(MAKE) -C $(PLATFORM)
-
-.installed-$(PLATFORM): $(LIBDYLIB)
- $(MAKE) -C $(PLATFORM) install
- touch $@
-
-clean:
- $(MAKE) -C $(PLATFORM) clean
- rm -f .installed-$(PLATFORM)
-
-distclean::
- rm -rf $(PLATFORM) .installed-$(PLATFORM)
-
@@ -60,7 +60,6 @@ SRCS += Utils/AEUtil.cpp
SRCS += Utils/AEStreamInfo.cpp
SRCS += Utils/AEPackIEC61937.cpp
SRCS += Utils/AEBitstreamPacker.cpp
-SRCS += Utils/AEWAVLoader.cpp
SRCS += Utils/AEELDParser.cpp
SRCS += Utils/AEDeviceInfo.cpp
SRCS += Utils/AELimiter.cpp
Oops, something went wrong.

0 comments on commit e36e4f0

Please sign in to comment.