Permalink
Browse files

Merge removal of unneeded libdts and liba52

Conflicts:
	.gitignore
	XBMC.xcodeproj/project.pbxproj
	configure.in
	lib/Makefile.in
	project/VS2010Express/XBMC.vcxproj
	project/VS2010Express/XBMC.vcxproj.filters
	tools/Linux/packaging/debian/copyright
	xbmc/DllPaths_win32.h
	xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in
  • Loading branch information...
anssih committed Feb 19, 2011
2 parents ca68de7 + 2886a8a commit bc57d598e74f984f5a89d446e6ea462c3ffed508
Showing with 5 additions and 125,106 deletions.
  1. +0 −83 .gitignore
  2. +0 −8 Makefile.in
  3. +0 −84 XBMC.xcodeproj/project.pbxproj
  4. +0 −151 configure.in
  5. +0 −139 lib/DllAc3codec.h
  6. +0 −126 lib/DllDCACodec.h
  7. +0 −63 lib/Makefile.in
  8. +0 −22 lib/liba52/AUTHORS
  9. +0 −340 lib/liba52/COPYING
  10. +0 −97 lib/liba52/ChangeLog
  11. +0 −24 lib/liba52/HISTORY
  12. +0 −291 lib/liba52/INSTALL
  13. +0 −3 lib/liba52/Makefile.am
  14. +0 −625 lib/liba52/Makefile.in
  15. +0 −46 lib/liba52/NEWS
  16. +0 −176 lib/liba52/README
  17. +0 −12 lib/liba52/TODO
  18. +0 −107 lib/liba52/acinclude.m4
  19. +0 −8,884 lib/liba52/aclocal.m4
  20. 0 lib/liba52/autotools/Makefile.am
  21. +0 −334 lib/liba52/autotools/Makefile.in
  22. +0 −1,561 lib/liba52/autotools/config.guess
  23. +0 −1,686 lib/liba52/autotools/config.sub
  24. +0 −589 lib/liba52/autotools/depcomp
  25. +0 −519 lib/liba52/autotools/install-sh
  26. +0 −8,413 lib/liba52/autotools/ltmain.sh
  27. +0 −367 lib/liba52/autotools/missing
  28. +0 −161 lib/liba52/autotools/mkinstalldirs
  29. +0 −8 lib/liba52/bootstrap
  30. +0 −16,866 lib/liba52/configure
  31. +0 −115 lib/liba52/configure.in
  32. +0 −1 lib/liba52/doc/Makefile.am
  33. +0 −334 lib/liba52/doc/Makefile.in
  34. +0 −208 lib/liba52/doc/liba52.txt
  35. +0 −3 lib/liba52/include/Makefile.am
  36. +0 −429 lib/liba52/include/Makefile.in
  37. +0 −68 lib/liba52/include/a52.h
  38. +0 −29 lib/liba52/include/attributes.h
  39. +0 −64 lib/liba52/include/audio_out.h
  40. +0 −141 lib/liba52/include/config.h.in
  41. +0 −37 lib/liba52/include/mm_accel.h
  42. 0 lib/liba52/include/stamp-h.in
  43. +0 −35 lib/liba52/include/tendra.h
  44. +0 −9 lib/liba52/liba52/Makefile.am
  45. +0 −484 lib/liba52/liba52/Makefile.in
  46. +0 −121 lib/liba52/liba52/a52_internal.h
  47. +0 −265 lib/liba52/liba52/bit_allocate.c
  48. +0 −99 lib/liba52/liba52/bitstream.c
  49. +0 −90 lib/liba52/liba52/bitstream.h
  50. +0 −19 lib/liba52/liba52/configure.incl
  51. +0 −655 lib/liba52/liba52/downmix.c
  52. +0 −432 lib/liba52/liba52/imdct.c
  53. +0 −921 lib/liba52/liba52/parse.c
  54. +0 −246 lib/liba52/liba52/tables.h
  55. +0 −7 lib/liba52/libao/Makefile.am
  56. +0 −461 lib/liba52/libao/Makefile.in
  57. +0 −92 lib/liba52/libao/audio_out.c
  58. +0 −151 lib/liba52/libao/audio_out_aif.c
  59. +0 −179 lib/liba52/libao/audio_out_al.c
  60. +0 −69 lib/liba52/libao/audio_out_float.c
  61. +0 −37 lib/liba52/libao/audio_out_internal.h
  62. +0 −78 lib/liba52/libao/audio_out_null.c
  63. +0 −194 lib/liba52/libao/audio_out_oss.c
  64. +0 −76 lib/liba52/libao/audio_out_peak.c
  65. +0 −167 lib/liba52/libao/audio_out_solaris.c
  66. +0 −145 lib/liba52/libao/audio_out_wav.c
  67. +0 −205 lib/liba52/libao/audio_out_win.c
  68. +0 −45 lib/liba52/libao/configure.incl
  69. +0 −178 lib/liba52/libao/float2s16.c
  70. +0 −27,221 lib/liba52/patches/AC3_BE-LE.patch
  71. +0 −11 lib/liba52/src/Makefile.am
  72. +0 −536 lib/liba52/src/Makefile.in
  73. +0 −46 lib/liba52/src/a52dec.1
  74. +0 −605 lib/liba52/src/a52dec.c
  75. +0 −9 lib/liba52/src/configure.incl
  76. +0 −35 lib/liba52/src/extract_a52.1
  77. +0 −362 lib/liba52/src/extract_a52.c
  78. +0 −1,055 lib/liba52/src/getopt.c
  79. +0 −169 lib/liba52/src/getopt.h
  80. +0 −40 lib/liba52/src/gettimeofday.c
  81. +0 −40 lib/liba52/src/gettimeofday.h
  82. +0 −6 lib/liba52/test/Makefile.am
  83. +0 −533 lib/liba52/test/Makefile.in
  84. +0 −79 lib/liba52/test/compare.c
  85. +0 −46 lib/liba52/test/compile
  86. +0 −24 lib/liba52/test/globals
  87. +0 −48 lib/liba52/test/regression
  88. +0 −10 lib/liba52/test/tests
  89. +0 −1 lib/liba52/vc++/Makefile.am
  90. +0 −334 lib/liba52/vc++/Makefile.in
  91. +0 −114 lib/liba52/vc++/a52dec.dsp
  92. +0 −59 lib/liba52/vc++/a52dec.dsw
  93. +0 −127 lib/liba52/vc++/config.h
  94. +0 −13 lib/liba52/vc++/inttypes.h
  95. +0 −128 lib/liba52/vc++/liba52.dsp
  96. +0 −21 lib/liba52/vc++/liba52.sln
  97. +0 −245 lib/liba52/vc++/liba52.vcproj
  98. +0 −221 lib/liba52/vc++/liba52.vcxproj
  99. +0 −44 lib/liba52/vc++/liba52.vcxproj.filters
  100. +0 −132 lib/liba52/vc++/libao.dsp
  101. +0 −31 lib/libdts/AUTHORS
  102. +0 −340 lib/libdts/COPYING
  103. +0 −352 lib/libdts/ChangeLog
  104. +0 −229 lib/libdts/INSTALL
  105. +0 −4 lib/libdts/Makefile.am
  106. +0 −539 lib/libdts/Makefile.in
  107. +0 −12 lib/libdts/NEWS
  108. +0 −170 lib/libdts/README
  109. +0 −28 lib/libdts/TODO
  110. +0 −698 lib/libdts/acinclude.m4
  111. +0 −1,599 lib/libdts/aclocal.m4
  112. 0 lib/libdts/autotools/Makefile.am
  113. +0 −273 lib/libdts/autotools/Makefile.in
  114. +0 −107 lib/libdts/autotools/compile
  115. +0 −1,500 lib/libdts/autotools/config.guess
  116. +0 −1,616 lib/libdts/autotools/config.sub
  117. +0 −479 lib/libdts/autotools/depcomp
  118. +0 −294 lib/libdts/autotools/install-sh
  119. +0 −336 lib/libdts/autotools/missing
  120. +0 −111 lib/libdts/autotools/mkinstalldirs
  121. +0 −68 lib/libdts/bootstrap
  122. +0 −144 lib/libdts/config.h.in
  123. +0 −10,575 lib/libdts/configure
  124. +0 −142 lib/libdts/configure.ac
  125. +0 −1 lib/libdts/debian/Makefile.am
  126. +0 −273 lib/libdts/debian/Makefile.in
  127. +0 −6 lib/libdts/debian/changelog
  128. +0 −1 lib/libdts/debian/compat
  129. +0 −20 lib/libdts/debian/control
  130. +0 −21 lib/libdts/debian/copyright
  131. +0 −67 lib/libdts/debian/rules
  132. +0 −1 lib/libdts/doc/Makefile.am
  133. +0 −273 lib/libdts/doc/Makefile.in
  134. +0 −223 lib/libdts/doc/libdts.txt
  135. +0 −3 lib/libdts/include/Makefile.am
  136. +0 −345 lib/libdts/include/Makefile.in
  137. +0 −41 lib/libdts/include/audio_out.h
  138. +0 −85 lib/libdts/include/dts.h
  139. +0 −35 lib/libdts/include/tendra.h
  140. +0 −9 lib/libdts/libao/Makefile.am
  141. +0 −416 lib/libdts/libao/Makefile.in
  142. +0 −96 lib/libdts/libao/audio_out.c
  143. +0 −151 lib/libdts/libao/audio_out_aif.c
  144. +0 −179 lib/libdts/libao/audio_out_al.c
  145. +0 −76 lib/libdts/libao/audio_out_float.c
  146. +0 −59 lib/libdts/libao/audio_out_internal.h
  147. +0 −79 lib/libdts/libao/audio_out_null.c
  148. +0 −201 lib/libdts/libao/audio_out_oss.c
  149. +0 −81 lib/libdts/libao/audio_out_peak.c
  150. +0 −167 lib/libdts/libao/audio_out_solaris.c
  151. +0 −311 lib/libdts/libao/audio_out_wav.c
  152. +0 −206 lib/libdts/libao/audio_out_win.c
  153. +0 −45 lib/libdts/libao/configure.incl
  154. +0 −212 lib/libdts/libao/convert2s16.c
  155. +0 −22 lib/libdts/libdts/Makefile.am
  156. +0 −539 lib/libdts/libdts/Makefile.in
  157. +0 −111 lib/libdts/libdts/bitstream.c
  158. +0 −67 lib/libdts/libdts/bitstream.h
  159. +0 −16 lib/libdts/libdts/configure.incl
  160. +0 −691 lib/libdts/libdts/downmix.c
  161. +0 −203 lib/libdts/libdts/dts_internal.h
  162. +0 −10 lib/libdts/libdts/libdts.pc.in
  163. +0 −1,298 lib/libdts/libdts/parse.c
  164. +0 −47 lib/libdts/libdts/tables.h
  165. +0 −4,122 lib/libdts/libdts/tables_adpcm.h
  166. +0 −2,085 lib/libdts/libdts/tables_fir.h
  167. +0 −1,070 lib/libdts/libdts/tables_huffman.h
  168. +0 −88 lib/libdts/libdts/tables_quantization.h
  169. +0 −2,075 lib/libdts/libdts/tables_vq.h
  170. +0 −14 lib/libdts/make-xbmc-lib.sh
  171. +0 −13 lib/libdts/src/Makefile.am
  172. +0 −483 lib/libdts/src/Makefile.in
  173. +0 −10 lib/libdts/src/configure.incl
  174. +0 −46 lib/libdts/src/dtsdec.1
  175. +0 −646 lib/libdts/src/dtsdec.c
  176. +0 −35 lib/libdts/src/extract_dts.1
  177. +0 −394 lib/libdts/src/extract_dts.c
  178. +0 −1,055 lib/libdts/src/getopt.c
  179. +0 −169 lib/libdts/src/getopt.h
  180. +0 −40 lib/libdts/src/gettimeofday.c
  181. +0 −45 lib/libdts/src/gettimeofday.h
  182. +0 −8 lib/libdts/test/Makefile.am
  183. +0 −462 lib/libdts/test/Makefile.in
  184. +0 −79 lib/libdts/test/compare.c
  185. +0 −52 lib/libdts/test/compile
  186. +0 −24 lib/libdts/test/globals
  187. +0 −48 lib/libdts/test/regression
  188. +0 −10 lib/libdts/test/tests
  189. +0 −1 lib/libdts/vc++/Makefile.am
  190. +0 −273 lib/libdts/vc++/Makefile.in
  191. +0 −145 lib/libdts/vc++/config.h
  192. +0 −114 lib/libdts/vc++/dtsdec.dsp
  193. +0 −59 lib/libdts/vc++/dtsdec.dsw
  194. +0 −11 lib/libdts/vc++/inttypes.h
  195. +0 −136 lib/libdts/vc++/libao.dsp
  196. +0 −9 lib/libdts/vc++/libdts.def
  197. +0 −140 lib/libdts/vc++/libdts.dsp
  198. +0 −316 lib/libdts/vc++/libdts.vcproj
  199. +0 −196 lib/libdts/vc++/libdts.vcxproj
  200. +0 −58 lib/libdts/vc++/libdts.vcxproj.filters
  201. +0 −4 project/VS2010Express/XBMC for Windows.sln
  202. +1 −13 project/VS2010Express/XBMC.vcxproj
  203. +0 −36 project/VS2010Express/XBMC.vcxproj.filters
  204. BIN system/players/dvdplayer/liba52.dll
  205. +0 −3 xbmc/DllPaths_generated.h.in
  206. +0 −3 xbmc/DllPaths_win32.h
  207. +0 −316 xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibDts.cpp
  208. +0 −79 xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibDts.h
  209. +0 −329 xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLiba52.cpp
  210. +0 −84 xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLiba52.h
  211. +0 −428 xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp
  212. +0 −86 xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h
  213. +0 −121 xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibDts.h
  214. +0 −128 xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLiba52.h
  215. +0 −3 xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in
  216. +0 −72 xbmc/cores/dvdplayer/DVDCodecs/Audio/liba52/a52.h
  217. +0 −85 xbmc/cores/dvdplayer/DVDCodecs/Audio/libdts/dts.h
  218. +0 −30 xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
  219. +0 −65 xbmc/cores/paplayer/AC3CDDACodec.cpp
  220. +0 −37 xbmc/cores/paplayer/AC3CDDACodec.h
  221. +0 −439 xbmc/cores/paplayer/AC3Codec.cpp
  222. +0 −83 xbmc/cores/paplayer/AC3Codec.h
  223. +3 −59 xbmc/cores/paplayer/CodecFactory.cpp
  224. +0 −62 xbmc/cores/paplayer/DTSCDDACodec.cpp
  225. +0 −37 xbmc/cores/paplayer/DTSCDDACodec.h
  226. +0 −556 xbmc/cores/paplayer/DTSCodec.cpp
  227. +0 −90 xbmc/cores/paplayer/DTSCodec.h
  228. +1 −5 xbmc/cores/paplayer/Makefile.in
View
@@ -360,11 +360,9 @@ config.log
/system/players/paplayer/vorbisfile.dll
/system/players/paplayer/vgmstream.dll
/system/players/paplayer/NoseFart.dll
-/system/players/paplayer/AC3Codec.dll
/system/players/paplayer/libsidplay2.dll
/system/players/paplayer/adpcm.dll
/system/players/dvdplayer/libmad.dll
-/system/players/dvdplayer/libdts.dll
# /system/players/dsplayer
/system/players/dsplayer/libsubs.dll
@@ -506,46 +504,6 @@ config.log
/lib/ffmpeg/doc/*.html
/lib/ffmpeg/doc/*.1
-# /lib/liba52/
-/lib/liba52/config.log
-/lib/liba52/config.status
-/lib/liba52/libtool
-/lib/liba52/Makefile
-/lib/liba52/include/stamp-h1
-/lib/liba52/src/a52dec
-/lib/liba52/src/extract_a52
-/lib/liba52/test/compare
-
-# /lib/liba52/autotools/
-/lib/liba52/autotools/Makefile
-
-# /lib/liba52/doc/
-/lib/liba52/doc/Makefile
-
-# /lib/liba52/include/
-/lib/liba52/include/stamp-h
-/lib/liba52/include/config.h
-/lib/liba52/include/Makefile
-
-# /lib/liba52/liba52/
-/lib/liba52/liba52/Makefile
-
-# /lib/liba52/libao/
-/lib/liba52/libao/Makefil
-/lib/liba52/libao/Makefile
-
-# /lib/liba52/src/
-/lib/liba52/src/Makefi
-/lib/liba52/src/Makefile
-
-# /lib/liba52/test/
-/lib/liba52/test/Makefile
-
-# /lib/liba52/vc++/
-/lib/liba52/vc++/Makefile
-/lib/liba52/vc++/Debug
-/lib/liba52/vc++/Release
-
# /lib/libdvd/
/lib/libdvd/Makefile
@@ -643,47 +601,6 @@ config.log
/lib/libdvd/libdvdread/autom4te.cache
/lib/libdvd/libdvdread/config.h.in~
-# /lib/libdts/
-/lib/libdts/config.log
-/lib/libdts/config.h
-/lib/libdts/Makefile
-/lib/libdts/config.status
-/lib/libdts/stamp-h1
-/lib/libdts/configure.lineno
-
-# /lib/libdts/autotools/
-/lib/libdts/autotools/Makefile
-
-# /lib/libdts/debian/
-/lib/libdts/debian/Makefile
-
-# /lib/libdts/doc/
-/lib/libdts/doc/Makefile
-
-# /lib/libdts/include/
-/lib/libdts/include/Makefile
-
-# /lib/libdts/libao/
-/lib/libdts/libao/Makefile
-
-# /lib/libdts/libdts/
-/lib/libdts/libdts/Makefile
-
-# /lib/libdts/src/
-/lib/libdts/src/extract_dts
-/lib/libdts/src/dtsdec
-/lib/libdts/src/Makefile
-
-# /lib/libdts/test/
-/lib/libdts/test/compare
-/lib/libdts/test/Makefile
-
-# /lib/libdts/vc++/
-/lib/libdts/vc++/Makefile
-/lib/libdts/vc++/libdts.lib
-/lib/libdts/vc++/Debug
-/lib/libdts/vc++/Release
-
# /lib/libmad/
/lib/libmad/config.h
/lib/libmad/Makefile
View
@@ -114,11 +114,6 @@ PAPCODECS_DIRS= \
lib/snesapu/SNES/SNESAPU \
lib/vgmstream \
-ifeq (@USE_INTERNAL_LIBA52@,1)
-PAPCODECS_DIRS+= \
- xbmc/cores/paplayer/AC3Codec
-endif
-
ifeq (@USE_ASAP_CODEC@,1)
PAPCODEC_DIRS+= \
lib/asap
@@ -454,9 +449,6 @@ libhdhomerun: dllloader
libid3tag: dllloader
$(MAKE) -C lib/libid3tag
papcodecs: dllloader dvdpcodecs
-ifeq (@USE_INTERNAL_LIBA52@,1)
- $(MAKE) -C xbmc/cores/paplayer/AC3Codec
-endif
$(MAKE) -C lib/xbadpcm
ifeq ($(findstring osx,@ARCH@), osx)
$(MAKE) -C lib/libflac

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -94,10 +94,6 @@ external_libraries_enabled="== Use of all supported external libraries enabled.
external_libraries_disabled="== Use of all supported external libraries disabled. =="
external_ffmpeg_enabled="== Use of external ffmpeg enabled. =="
external_ffmpeg_disabled="== Use of external ffmpeg disabled. =="
-external_liba52_enabled="== Use of external liba52 enabled. =="
-external_liba52_disabled="== Use of external liba52 disabled. =="
-external_libdts_enabled="== Use of external libdts enabled. =="
-external_libdts_disabled="== Use of external libdts disabled. =="
external_python_enabled="== Use of external python enabled. =="
external_python_disabled="== Use of external python disabled. =="
ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
@@ -274,18 +270,6 @@ AC_ARG_ENABLE([optical-drive],
[use_optical_drive=$enableval],
[use_optical_drive=yes])
-AC_ARG_ENABLE([libdts],
- [AS_HELP_STRING([--enable-libdts],
- [enable deprecated libdts support])],
- [use_libdts=$enableval],
- [use_libdts=no])
-
-AC_ARG_ENABLE([liba52],
- [AS_HELP_STRING([--enable-liba52],
- [enable deprecated liba52 support])],
- [use_liba52=$enableval],
- [use_liba52=no])
-
AC_ARG_ENABLE([libbluray],
[AS_HELP_STRING([--enable-libbluray],
[enable libbluray support])],
@@ -312,18 +296,6 @@ AC_ARG_ENABLE([external-ffmpeg],
[use_external_ffmpeg=$enableval],
[use_external_ffmpeg=$use_external_libraries])
-AC_ARG_ENABLE([external-liba52],
- [AS_HELP_STRING([--enable-external-liba52],
- [enable use of external liba52 library (default is no) 'Linux only'])],
- [use_external_liba52=$enableval],
- [use_external_liba52=$use_external_libraries])
-
-AC_ARG_ENABLE([external-libdts],
- [AS_HELP_STRING([--enable-external-libdts],
- [enable use of external libdts library (default is no) 'Linux only'])],
- [use_external_libdts=$enableval],
- [use_external_libdts=$use_external_libraries])
-
AC_ARG_ENABLE([external-python],
[AS_HELP_STRING([--enable-external-python],
[enable use of external python library (default is no) 'Linux only'])],
@@ -888,34 +860,6 @@ else
AC_DEFINE([PIX_FMT_VDPAU_MPEG4_IN_AVUTIL], [1], [Whether AVUtil defines PIX_FMT_VDPAU_MPEG4.])
fi
-# External liba52 if deprecated a52 support is enabled
-if test "$use_liba52" = "yes" && "$use_external_liba52" = "yes"; then
- AC_CHECK_LIB([a52], [main],, AC_MSG_ERROR($missing_library))
-
- AC_MSG_NOTICE($external_liba52_enabled)
- USE_EXTERNAL_LIBA52=1
- AC_DEFINE([USE_EXTERNAL_LIBA52], [1], [Whether to use external liba52 library.])
- USE_INTERNAL_LIBA52=0
- SKIP_CONFIG_LIBA52=1
-else
- AC_MSG_NOTICE($external_liba52_disabled)
- USE_EXTERNAL_LIBA52=0
-fi
-
-# External libdts if deprecated dts support enabled
-if test "$use_libdts" = "yes" && "$use_external_libdts" = "yes"; then
- AC_CHECK_LIB([dts], [main],, AC_MSG_ERROR($missing_library))
-
- AC_MSG_NOTICE($external_libdts_enabled)
- USE_EXTERNAL_LIBDTS=1
- AC_DEFINE([USE_EXTERNAL_LIBDTS], [1], [Whether to use external libdts library.])
- USE_INTERNAL_LIBDTS=0
- SKIP_CONFIG_LIBDTS=1
-else
- AC_MSG_NOTICE($external_libdts_disabled)
- USE_EXTERNAL_LIBDTS=0
-fi
-
# External Python
if test "$use_external_python" = "yes"; then
AC_CHECK_LIB([python2.6], [main],
@@ -1348,54 +1292,12 @@ else
final_message="$final_message\n Optical drive:\tNo"
fi
-if test "$use_libdts" = "yes"; then
- USE_LIBDTS_DECODER=1
- AC_DEFINE([USE_LIBDTS_DECODER], [1], [Define to 1 to enable deprecated libdts support])
- if ! test "$USE_EXTERNAL_LIBDTS" = "1"; then
- USE_INTERNAL_LIBDTS=1
- SKIP_CONFIG_LIBDTS=0
- fi
- final_message="$final_message\n Deprecated libdts:\tYes"
-else
- USE_INTERNAL_LIBDTS=0
- SKIP_CONFIG_LIBDTS=1
- final_message="$final_message\n Deprecated libdts:\tNo"
-fi
-
-if test "$use_liba52" = "yes"; then
- USE_LIBA52_DECODER=1
- AC_DEFINE([USE_LIBA52_DECODER], [1], [Define to 1 to enable deprecated liba52 support])
- if ! test "$USE_EXTERNAL_LIBA52" = "1"; then
- USE_INTERNAL_LIBA52=1
- SKIP_CONFIG_LIBA52=0
- fi
- final_message="$final_message\n Deprecated liba52:\tYes"
-else
- USE_INTERNAL_LIBA52=0
- SKIP_CONFIG_LIBA52=1
- final_message="$final_message\n Deprecated liba52:\tNo"
-fi
-
### External libraries messages
if test "$use_external_ffmpeg" = "yes"; then
final_message="$final_message\n External FFmpeg:\tYes"
else
final_message="$final_message\n External FFmpeg:\tNo"
fi
-if test "$use_liba52" = "yes"; then
- if test "$use_external_liba52" = "yes"; then
- final_message="$final_message\n External liba52:\tYes"
- else
- final_message="$final_message\n External liba52:\tNo"
- fi
-fi
-if test "$use_libdts" = "yes"; then
- if test "$use_external_libdts" = "yes"; then
- final_message="$final_message\n External libdts:\tYes"
- else
- final_message="$final_message\n External libdts:\tNo"
- fi
-fi
if test "$use_external_python" = "yes"; then
final_message="$final_message\n External Python:\tYes"
else
@@ -1490,11 +1392,7 @@ AC_SUBST(SDL_DEFINES)
AC_SUBST(BUILD_DVDCSS)
AC_SUBST(BUILD_GOOM)
AC_SUBST(USE_EXTERNAL_FFMPEG)
-AC_SUBST(USE_EXTERNAL_LIBA52)
-AC_SUBST(USE_INTERNAL_LIBA52)
AC_SUBST(USE_EXTERNAL_LIBASS)
-AC_SUBST(USE_EXTERNAL_LIBDTS)
-AC_SUBST(USE_INTERNAL_LIBDTS)
AC_SUBST(USE_EXTERNAL_LIBMPEG2)
AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
AC_SUBST(USE_EXTERNAL_PYTHON)
@@ -1700,28 +1598,6 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
fi
], [$USE_EXTERNAL_FFMPEG])
-XB_CONFIG_MODULE([lib/libdts], [
- if test "$host_vendor" = "apple" ; then
- CFLAGS="$CFLAGS -fno-common"
- LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
- ./configure \
- --disable-oss \
- --disable-solaris-audio \
- --disable-al-audio \
- --disable-win
- else
- ./configure \
- --host=$host_alias \
- --build=$build_alias \
- --target=$target_alias \
- --disable-oss \
- --disable-solaris-audio \
- --disable-al-audio \
- --disable-win \
- CFLAGS="$CFLAGS"
- fi
-], [$SKIP_CONFIG_LIBDTS])
-
XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [
if test "$host_vendor" = "apple" ; then
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
@@ -1795,33 +1671,6 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
fi
], [0])
-XB_CONFIG_MODULE([lib/liba52], [
- if test "$host_vendor" = "apple" ; then
- CFLAGS="$CFLAGS -fno-common" \
- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
- --with-pic \
- --disable-static \
- --enable-shared \
- --disable-oss \
- --disable-solaris-audio \
- --disable-win \
- --disable-al-audio
- else
- ./configure \
- --host=$host_alias \
- --build=$build_alias \
- --target=$target_alias \
- --with-pic \
- --disable-static \
- --enable-shared \
- --disable-oss \
- --disable-solaris-audio \
- --disable-win \
- --disable-al-audio \
- CFLAGS="$CFLAGS"
- fi
-], [$SKIP_CONFIG_LIBA52])
-
XB_CONFIG_MODULE([lib/libmad], [
if test "$host_vendor" = "apple" ; then
CFLAGS="$CFLAGS -fno-common" \
Oops, something went wrong.

0 comments on commit bc57d59

Please sign in to comment.