aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml6
-rw-r--r--configure.ac3
-rw-r--r--docs/README.armel2
-rw-r--r--docs/README.linux4
-rw-r--r--docs/README.ubuntu4
-rw-r--r--project/BuildDependencies/scripts/0_package.list2
-rw-r--r--tools/android/packaging/Makefile.in1
-rw-r--r--tools/buildsteps/win32/fmpeg_options.txt2
-rw-r--r--tools/depends/target/Makefile7
-rw-r--r--tools/depends/target/ffmpeg/CMakeLists.txt3
-rw-r--r--tools/depends/target/ffmpeg/Makefile1
-rwxr-xr-xtools/depends/target/ffmpeg/autobuild.sh3
-rw-r--r--tools/depends/target/libogg/Makefile48
-rw-r--r--tools/depends/target/libvorbis/Makefile62
14 files changed, 11 insertions, 137 deletions
diff --git a/.travis.yml b/.travis.yml
index 8380864bd8..18611379b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,9 +73,9 @@ install:
gettext git-core gperf libasound2-dev libass-dev libbz2-dev libcap-dev libcdio-dev libcrossguid-dev libcurl3
libcurl4-openssl-dev libdbus-1-dev libfontconfig-dev libegl1-mesa-dev libfreetype6-dev libfribidi-dev libgif-dev
libiso9660-dev libjpeg-dev libltdl-dev liblzo2-dev libmicrohttpd-dev libmodplug-dev libmysqlclient-dev libnfs-dev
- libogg-dev libpcre3-dev libplist-dev libpng-dev libpulse-dev libsdl2-dev libsmbclient-dev libsqlite3-dev libssh-dev
- libssl-dev libtag1-dev libtinyxml-dev libtool libudev-dev libusb-dev libva-dev libvdpau-dev libvorbis-dev
- libvorbisenc2 libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxslt1-dev libxt-dev libyajl-dev mesa-utils
+ libpcre3-dev libplist-dev libpng-dev libpulse-dev libsdl2-dev libsmbclient-dev libsqlite3-dev libssh-dev
+ libssl-dev libtag1-dev libtinyxml-dev libtool libudev-dev libusb-dev libva-dev libvdpau-dev
+ libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxslt1-dev libxt-dev libyajl-dev mesa-utils
nasm pmount python-dev python-imaging python-sqlite swig unzip uuid-dev yasm zip zlib1g-dev;
fi
diff --git a/configure.ac b/configure.ac
index ec0127dd43..93690452c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2294,9 +2294,6 @@ AC_SUBST(PYTHON_VERSION)
AC_SUBST(OUTPUT_FILES)
AC_SUBST(HAVE_XBMC_NONFREE)
AC_SUBST(LIBCURL_BASENAME)
-AC_SUBST(LIBVORBISFILE_BASENAME)
-AC_SUBST(LIBOGG_BASENAME)
-AC_SUBST(LIBVORBIS_BASENAME)
AC_SUBST(LIBASS_BASENAME)
AC_SUBST(LIBMEPG2_BASENAME)
AC_SUBST_FILE(XBMC_STANDALONE_SH_PULSE)
diff --git a/docs/README.armel b/docs/README.armel
index 38d9c86d9f..6e0c4301d7 100644
--- a/docs/README.armel
+++ b/docs/README.armel
@@ -217,7 +217,7 @@ These are python and liblzo2
For Angstrom:
$ opkg update
- $ opkg install subversion make g++ gcc gawk pmount libtool automake gperf unzip bison libsdl-1.2-dev libsdl-image-1.2-dev libsdl-gfx-dev libsdl-mixer-1.2-dev libfribidi-dev liblzo-dev libfreetype-dev libsqlite3-dev libasound2 python-sqlite3 libcurl4 libxrandr-dev libxrender-dev libmad-dev libogg-dev libvorbis-dev libmysqlclient-dev libpcre-dev libdbus-glib-1-dev hal-dev libfontconfig-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev
+ $ opkg install subversion make g++ gcc gawk pmount libtool automake gperf unzip bison libsdl-1.2-dev libsdl-image-1.2-dev libsdl-gfx-dev libsdl-mixer-1.2-dev libfribidi-dev liblzo-dev libfreetype-dev libsqlite3-dev libasound2 python-sqlite3 libcurl4 libxrandr-dev libxrender-dev libmad-dev libmysqlclient-dev libpcre-dev libdbus-glib-1-dev hal-dev libfontconfig-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev
Unfortunately this will only install the packages that are available through opkg. There will be further packages that need to be installed.
Either use the method mentioned below, or selectively find and install packages, mentioned at the bottom of this README.
diff --git a/docs/README.linux b/docs/README.linux
index 0d68ce600c..9a7d282a10 100644
--- a/docs/README.linux
+++ b/docs/README.linux
@@ -51,11 +51,11 @@ Build-Depends: autoconf, automake, autopoint, autotools-dev, cmake, curl,
libcwiid-dev, libdbus-1-dev, libegl1-mesa-dev, libfontconfig-dev, libfreetype6-dev,
libfribidi-dev, libgif-dev (>= 4.1.6), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
libiso9660-dev, libjpeg-dev, libltdl-dev, liblzo2-dev, libmicrohttpd-dev,
- libmodplug-dev, libmpcdec-dev, libmysqlclient-dev, libnfs-dev, libogg-dev,
+ libmodplug-dev, libmpcdec-dev, libmysqlclient-dev, libnfs-dev,
libpcre3-dev, libplist-dev, libpng12-dev | libpng-dev, libpulse-dev, librtmp-dev,libsdl2-dev,
libshairplay-dev, libsmbclient-dev, libsqlite3-dev, libssh-dev, libssl-dev, libswscale-dev,
libtag1-dev (>= 1.8), libtinyxml-dev (>= 2.6.2), libtool, libudev-dev,
- libusb-dev, libva-dev, libvdpau-dev, libvorbis-dev, libxinerama-dev, libxml2-dev,
+ libusb-dev, libva-dev, libvdpau-dev, libxinerama-dev, libxml2-dev,
libxmu-dev, libxrandr-dev, libxslt1-dev, libxt-dev, libyajl-dev (>=2.0), lsb-release,
nasm [!amd64], python-dev, python-imaging, python-support, swig, unzip, uuid-dev, yasm,
zip, zlib1g-dev
diff --git a/docs/README.ubuntu b/docs/README.ubuntu
index 42343b6404..36951b5c3d 100644
--- a/docs/README.ubuntu
+++ b/docs/README.ubuntu
@@ -87,9 +87,9 @@ For Ubuntu (all versions >= 7.04):
libcurl4-openssl-dev libdbus-1-dev libfontconfig-dev libegl1-mesa-dev libfreetype6-dev \
libfribidi-dev libgif-dev libiso9660-dev libjpeg-dev liblzo2-dev \
libmicrohttpd-dev libmodplug-dev libmysqlclient-dev libnfs-dev \
- libogg-dev libpcre3-dev libplist-dev libpng-dev libpulse-dev libsdl2-dev libsmbclient-dev \
+ libpcre3-dev libplist-dev libpng-dev libpulse-dev libsdl2-dev libsmbclient-dev \
libsqlite3-dev libssh-dev libssl-dev libtinyxml-dev libtool libudev-dev libusb-dev \
- libva-dev libvdpau-dev libvorbis-dev libvorbisenc2 libxml2-dev libxmu-dev libxrandr-dev \
+ libva-dev libvdpau-dev libxml2-dev libxmu-dev libxrandr-dev \
libxrender-dev libxslt1-dev libxt-dev libyajl-dev mesa-utils nasm pmount python-dev \
python-imaging python-sqlite swig unzip uuid-dev yasm zip zlib1g-dev
diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list
index 9da8f972f0..1ffddc9ebf 100644
--- a/project/BuildDependencies/scripts/0_package.list
+++ b/project/BuildDependencies/scripts/0_package.list
@@ -26,13 +26,11 @@ libjpeg-turbo-1.2.0-win32.7z
liblzo-2.04-win32.7z
libmicrohttpd-0.9.48-win32-vc140-v2.7z
libnfs-1.10.0-win32.7z
-libogg-vc100-1.2.0-win32.7z
libplist-1.7-win32-3.7z
libpng-1.5.13-win32.7z
librtmp-20150114-git-a107ce-win32.7z
libshairplay-52fd9db-win32.7z
libssh-0.5.0-1-win32.zip
-libvorbis-vc100-1.3.1-win32.7z
libxml2-2.7.8_1-win32.7z
libxslt-1.1.26_1-win32.7z
libyajl-2.0.1-win32.7z
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in
index e374bc3af2..7dc1183ffb 100644
--- a/tools/android/packaging/Makefile.in
+++ b/tools/android/packaging/Makefile.in
@@ -3,7 +3,6 @@ include ../../depends/Makefile.include
OBJS = libcurl.so \
librtmp.so \
libplist.so libshairplay.so \
- libxbogg.so libxbvorbis.so libxbvorbisfile.so \
libnfs.so libass.so \
libbluray.so libsmbclient.so
diff --git a/tools/buildsteps/win32/fmpeg_options.txt b/tools/buildsteps/win32/fmpeg_options.txt
index 8f06cd4b30..fb9f2954fc 100644
--- a/tools/buildsteps/win32/fmpeg_options.txt
+++ b/tools/buildsteps/win32/fmpeg_options.txt
@@ -11,11 +11,9 @@
--enable-muxer=adts
--enable-muxer=asf
--enable-muxer=ipod
---enable-muxer=ogg
--enable-encoder=ac3
--enable-encoder=aac
--enable-encoder=wmav2
---enable-encoder=libvorbis
--enable-encoder=png
--enable-encoder=mjpeg
--enable-protocol=http
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index 4c768cdca1..5d743f4c6e 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -8,9 +8,7 @@ DEPENDS = \
pcre expat gettext sqlite3 libgpg-error \
libgcrypt bzip2 liblzo2 libzip freetype2 fontconfig \
openssl gmp nettle gnutls curl \
- libjpeg-turbo libpng \
- libogg libvorbis fribidi \
- libass \
+ libjpeg-turbo libpng fribidi libass \
libmodplug librtmp libxml2 yajl libmicrohttpd mysql libffi \
python27 libshairplay \
libplist libcec libbluray tinyxml dummy-libxbmc \
@@ -83,7 +81,6 @@ gettext: $(ICONV)
libgcrypt: libgpg-error
fontconfig: freetype2 expat $(ICONV)
curl: openssl
-libvorbis: libogg
libass: fontconfig libpng freetype2 expat $(ICONV)
librtmp: openssl
libmicrohttpd: gnutls libgcrypt libgpg-error
@@ -102,7 +99,7 @@ pythonmodule-pil: $(ZLIB) libjpeg-turbo libpng freetype2 python27 pythonmodule-s
pythonmodule-setuptools: python27
libsdl2: $(LINUX_SYSTEM_LIBS)
libxslt: libgcrypt libxml2
-ffmpeg: $(ICONV) $(ZLIB) bzip2 libvorbis $(FFMPEG_DEPENDS)
+ffmpeg: $(ICONV) $(ZLIB) bzip2 $(FFMPEG_DEPENDS)
libcec: platform
crossguid: $(CROSSGUID_DEPS)
libdvdnav: libdvdread
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt
index a061fd5a76..6e804024d4 100644
--- a/tools/depends/target/ffmpeg/CMakeLists.txt
+++ b/tools/depends/target/ffmpeg/CMakeLists.txt
@@ -16,8 +16,7 @@ if(CROSSCOMPILING)
endif()
if(CORE_SYSTEM_NAME STREQUAL linux)
- list(APPEND ffmpeg_conf --enable-vdpau --enable-vaapi
- --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis)
+ list(APPEND ffmpeg_conf --enable-vdpau --enable-vaapi)
elseif(CORE_SYSTEM_NAME STREQUAL android)
if(CPU MATCHES arm)
list(APPEND ffmpeg_conf --cpu=cortex-a9)
diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile
index 277d281867..f52e80268f 100644
--- a/tools/depends/target/ffmpeg/Makefile
+++ b/tools/depends/target/ffmpeg/Makefile
@@ -27,7 +27,6 @@ endif
ifeq ($(OS), linux)
ffmpg_config += --target-os=$(OS) --cpu=$(CPU)
ffmpg_config += --enable-vdpau --enable-vaapi
- ffmpg_config += --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis
endif
ifeq ($(OS), android)
ifeq ($(findstring arm, $(CPU)), arm)
diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh
index bf02e526f1..1add222869 100755
--- a/tools/depends/target/ffmpeg/autobuild.sh
+++ b/tools/depends/target/ffmpeg/autobuild.sh
@@ -152,9 +152,6 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
--enable-encoder=aac \
--enable-encoder=wmav2 \
--enable-protocol=http \
- --enable-libvorbis \
- --enable-muxer=ogg \
- --enable-encoder=libvorbis \
--enable-encoder=png \
--enable-encoder=mjpeg \
--enable-nonfree \
diff --git a/tools/depends/target/libogg/Makefile b/tools/depends/target/libogg/Makefile
deleted file mode 100644
index e7d8867c6f..0000000000
--- a/tools/depends/target/libogg/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile
-
-# lib name, version
-LIBNAME=libogg
-VERSION=1.1.4
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-# configuration settings
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
- ./configure --prefix=$(PREFIX)
-
-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
-ifeq ($(OS),android)
- rm -f $(PREFIX)/lib/libogg.la $(PREFIX)/lib/libogg.so $(PREFIX)/lib/libogg.so.0
- mv -f $(PREFIX)/lib/libogg.so.0.6.0 $(PREFIX)/lib/libxbogg.so
- ln -sf $(PREFIX)/lib/libxbogg.so $(PREFIX)/lib/libogg.so
- $(RPL) -e "libogg.so.0" "libxbogg.so" $(PREFIX)/lib/libxbogg.so
- -$(READELF) --dynamic $(PREFIX)/lib/libxbogg.so | grep ibrary
-endif
- touch $@
-
-clean:
- $(MAKE) -C $(PLATFORM) clean
- rm -f .installed-$(PLATFORM)
-
-distclean::
- rm -rf $(PLATFORM) .installed-$(PLATFORM)
-
diff --git a/tools/depends/target/libvorbis/Makefile b/tools/depends/target/libvorbis/Makefile
deleted file mode 100644
index d869c89831..0000000000
--- a/tools/depends/target/libvorbis/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile
-
-# lib name, version
-LIBNAME=libvorbis
-VERSION=1.3.2
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-export LIBS=-lm
-# configuration settings
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
- ./configure --prefix=$(PREFIX) --disable-oggtest --disable-docs --disable-examples
-
-LIBDYLIB=$(PLATFORM)/lib/.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)
- sed -ie "s|SUBDIRS = m4 include vq lib examples test doc|SUBDIRS = m4 include lib|" "$(PLATFORM)/Makefile.in"
-ifeq ($(CPU), arm64)
- sed -ie "s|-force_cpusubtype_ALL||" "$(PLATFORM)/Configure"
- sed -ie "s|-force_cpusubtype_ALL||" "$(PLATFORM)/Makefile.in"
-endif
- cd $(PLATFORM); $(CONFIGURE)
-
-$(LIBDYLIB): $(PLATFORM)
- $(MAKE) -C $(PLATFORM)
-
-.installed-$(PLATFORM): $(LIBDYLIB)
- $(MAKE) -C $(PLATFORM) install
-ifeq ($(OS),android)
- rm -f $(PREFIX)/lib/libvorbis.la $(PREFIX)/lib/libvorbis.so $(PREFIX)/lib/libvorbis.so.0
- mv -f $(PREFIX)/lib/libvorbis.so.0.4.5 $(PREFIX)/lib/libxbvorbis.so
- ln -sf $(PREFIX)/lib/libxbvorbis.so $(PREFIX)/lib/libvorbis.so
- $(RPL) -e "libvorbis.so.0" "libxbvorbis.so" $(PREFIX)/lib/libxbvorbis.so
- -$(READELF) --dynamic $(PREFIX)/lib/libxbvorbis.so | grep ibrary
- #
- rm -f $(PREFIX)/lib/libvorbisfile.la $(PREFIX)/lib/libvorbisfile.so $(PREFIX)/lib/libvorbisfile.so.3
- mv -f $(PREFIX)/lib/libvorbisfile.so.3.3.4 $(PREFIX)/lib/libxbvorbisfile.so
- ln -sf $(PREFIX)/lib/libxbvorbisfile.so $(PREFIX)/lib/libvorbisfile.so
- $(RPL) -e "libvorbisfile.so.3" "libxbvorbisfile.so" $(PREFIX)/lib/libxbvorbisfile.so
- $(RPL) -e "libvorbis.so.0" "libxbvorbis.so" $(PREFIX)/lib/libxbvorbisfile.so
- -$(READELF) --dynamic $(PREFIX)/lib/libxbvorbisfile.so | grep ibrary
- #
-endif
- touch $@
-
-clean:
- $(MAKE) -C $(PLATFORM) clean
- rm -f .installed-$(PLATFORM)
-
-distclean::
- rm -rf $(PLATFORM) .installed-$(PLATFORM)
-
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-18 13:12:16 +0000