aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/README.armel2
-rw-r--r--docs/README.linux2
-rw-r--r--docs/README.ubuntu2
-rw-r--r--tools/depends/target/Makefile3
-rw-r--r--tools/depends/target/jasper/Makefile44
-rw-r--r--tools/rbp/depends/Makefile2
-rw-r--r--tools/rbp/depends/jasper/.gitignore1
-rw-r--r--tools/rbp/depends/jasper/Makefile43
8 files changed, 5 insertions, 94 deletions
diff --git a/docs/README.armel b/docs/README.armel
index c5d9b68155..125e63eb79 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 libjasper-dev libfontconfig-dev boost-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 libogg-dev libvorbis-dev libmysqlclient-dev libpcre-dev libdbus-glib-1-dev hal-dev libfontconfig-dev boost-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 741277c090..9b94e0eeb6 100644
--- a/docs/README.linux
+++ b/docs/README.linux
@@ -50,7 +50,7 @@ Build-Depends: autoconf, automake, autopoint, autotools-dev, cmake, curl,
libcdio-dev, libcec-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev,
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, libjasper-dev, libjpeg-dev, libltdl-dev, liblzo2-dev, libmicrohttpd-dev,
+ libiso9660-dev, libjpeg-dev, libltdl-dev, liblzo2-dev, libmicrohttpd-dev,
libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libmysqlclient-dev, libnfs-dev, libogg-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,
diff --git a/docs/README.ubuntu b/docs/README.ubuntu
index 81a96af250..8732c9ed83 100644
--- a/docs/README.ubuntu
+++ b/docs/README.ubuntu
@@ -85,7 +85,7 @@ For Ubuntu (all versions >= 7.04):
default-jre fp-compiler gawk gdc gettext git-core gperf libasound2-dev libass-dev \
libboost-dev libboost-thread-dev libbz2-dev libcap-dev libcdio-dev libcurl3 \
libcurl4-openssl-dev libdbus-1-dev libfontconfig-dev libegl1-mesa-dev libfreetype6-dev \
- libfribidi-dev libgif-dev libiso9660-dev libjasper-dev libjpeg-dev liblzo2-dev \
+ libfribidi-dev libgif-dev libiso9660-dev libjpeg-dev liblzo2-dev \
libmicrohttpd-dev libmodplug-dev libmpeg2-4-dev libmpeg3-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 libtiff-dev libtinyxml-dev libtool libudev-dev libusb-dev \
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index fc7c8d5271..eeb7339309 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -8,7 +8,7 @@ DEPENDS = \
pcre expat gettext sqlite3 libgpg-error \
libgcrypt bzip2 liblzo2 libzip freetype2 fontconfig \
openssl gmp nettle gnutls libssh2 curl \
- libjpeg-turbo tiff jasper libpng \
+ libjpeg-turbo tiff libpng \
libogg libvorbis libflac fribidi libmpeg2 \
libass libsquish \
libmodplug librtmp libxml2 yajl libmicrohttpd mysql libffi \
@@ -78,7 +78,6 @@ fontconfig: freetype2 expat $(ICONV)
libssh2: libgcrypt openssl
curl: openssl libssh2
tiff: libjpeg-turbo
-jasper: libjpeg-turbo
libvorbis: libogg
libflac: libogg gettext
libass: fontconfig libpng freetype2 expat $(ICONV)
diff --git a/tools/depends/target/jasper/Makefile b/tools/depends/target/jasper/Makefile
deleted file mode 100644
index 15d302587e..0000000000
--- a/tools/depends/target/jasper/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile
-
-# lib name, version
-LIBNAME=jasper
-VERSION=1.900.1
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).zip
-ARCHIVE_TOOL=unzip
-ARCHIVE_TOOL_FLAGS=
-
-# configuration settings
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) acaux/ ;\
- ./configure --prefix=$(PREFIX)
-
-LIBDYLIB=$(PLATFORM)/src/lib$(LIBNAME)/.libs/lib$(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)
- $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- mv $(SOURCE)/* $(PLATFORM) && rm -rf $(SOURCE)
- 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)
-
diff --git a/tools/rbp/depends/Makefile b/tools/rbp/depends/Makefile
index 12e7260f29..42e897f53a 100644
--- a/tools/rbp/depends/Makefile
+++ b/tools/rbp/depends/Makefile
@@ -5,7 +5,7 @@ ifeq ($(USE_BUILDROOT),1)
SUBDIRS = ffmpeg xbmc
else
BUILDTOOLS = help2man autoconf automake libtool pkg-config yasm cmake patchelf
- SUBDIRS = liblzo2 tiff libnfs jasper libplist libshairplay tinyxml ffmpeg xbmc
+ SUBDIRS = liblzo2 tiff libnfs libplist libshairplay tinyxml ffmpeg xbmc
endif
IMAGENAME = xbmc-rbp-`date +'%y%m%d'`
diff --git a/tools/rbp/depends/jasper/.gitignore b/tools/rbp/depends/jasper/.gitignore
deleted file mode 100644
index 7030c19dfa..0000000000
--- a/tools/rbp/depends/jasper/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-jasper-1.900.1
diff --git a/tools/rbp/depends/jasper/Makefile b/tools/rbp/depends/jasper/Makefile
deleted file mode 100644
index 8898a56f83..0000000000
--- a/tools/rbp/depends/jasper/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-include ../../Makefile.include
-include ../depends.mk
-
-# lib name, version
-LIBNAME=jasper
-VERSION=1.900.1
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).zip
-ARCHIVE_TOOL=unzip
-ARCHIVE_TOOL_FLAGS=
-
-# configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST)
-
-LIBDYLIB=$(SOURCE)/$(LIBNAME)/.libs/$(LIBNAME).so
-
-CLEAN_FILES=$(ARCHIVE) $(SOURCE)
-
-all: $(LIBDYLIB) .installed
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
- $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
- rm -rf $(SOURCE)
- $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- echo $(SOURCE) > .gitignore
- cd $(SOURCE); $(CONFIGURE)
-
-$(LIBDYLIB): $(SOURCE)
- make -j $(JOBS) -C $(SOURCE)
-
-.installed:
- make -C $(SOURCE) install
- touch $@
-
-clean:
- make -C $(SOURCE) clean
- rm -f .installed
-
-distclean::
- rm -rf $(SOURCE) .installed
-
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-25 19:53:17 +0000