diff --git a/.gitignore b/.gitignore index 88617d3f15d6d..c7af9f8919a06 100644 --- a/.gitignore +++ b/.gitignore @@ -155,10 +155,6 @@ config.log # /lib/ /lib/Makefile -# /lib/addons/ -/lib/addons/script.module.pil/ -!/lib/addons/script.module.pil/Makefile - # /lib/asap/ /lib/asap/Makefile /lib/asap/players.h diff --git a/configure.in b/configure.in index 489a2e11b4a1e..db1d01207e207 100644 --- a/configure.in +++ b/configure.in @@ -2377,7 +2377,6 @@ OUTPUT_FILES="Makefile \ lib/libhdhomerun/Makefile \ lib/libsquish/Makefile \ lib/cximage-6.0/Makefile \ - lib/addons/script.module.pil/Makefile \ lib/libUPnP/Makefile \ xbmc/DllPaths_generated.h \ xbmc/DllPaths_generated_android.h \ diff --git a/docs/README.linux b/docs/README.linux index 1f3f2f71d364d..b36846d7ef934 100644 --- a/docs/README.linux +++ b/docs/README.linux @@ -99,9 +99,7 @@ Tip: by adding -j to the make command, you describe how many $ make -j2 -.3 $ make -C lib/addons/script.module.pil - -.4 $ make install +.3 $ make install This will install XBMC in the prefix provided in 4.1 as well as a launcher script. diff --git a/lib/addons/script.module.pil/Imaging-1.1.7-access.patch b/lib/addons/script.module.pil/Imaging-1.1.7-access.patch deleted file mode 100644 index dd51f4ac8e407..0000000000000 --- a/lib/addons/script.module.pil/Imaging-1.1.7-access.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rupN Imaging-1.1.7/libImaging/Access.c Imaging-1.1.7-mod/libImaging/Access.c ---- Imaging-1.1.7/libImaging/Access.c 2009-10-31 20:44:12.000000000 -0400 -+++ Imaging-1.1.7-mod/libImaging/Access.c 2011-10-10 19:40:22.000000000 -0400 -@@ -32,7 +32,7 @@ add_item(const char* mode) - { - UINT32 i = hash(mode); - /* printf("hash %s => %d\n", mode, i); */ -- if (access_table[i].mode) { -+ if (access_table[i].mode && (strcmp(mode, access_table[i].mode) != 0)) { - fprintf(stderr, "AccessInit: hash collision: %d for both %s and %s\n", - i, mode, access_table[i].mode); - exit(1); - diff --git a/lib/addons/script.module.pil/Imaging-1.1.7-crosscompiling-0.1.patch b/lib/addons/script.module.pil/Imaging-1.1.7-crosscompiling-0.1.patch deleted file mode 100644 index ccd7afde487ff..0000000000000 --- a/lib/addons/script.module.pil/Imaging-1.1.7-crosscompiling-0.1.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur Imaging-1.1.7/setup.py Imaging-1.1.7.patch/setup.py ---- Imaging-1.1.7/setup.py 2011-04-17 09:31:07.000000000 +0200 -+++ Imaging-1.1.7.patch/setup.py 2011-04-17 09:54:20.880047886 +0200 -@@ -147,7 +147,6 @@ - add_directory(library_dirs, "/opt/local/lib") - add_directory(include_dirs, "/opt/local/include") - -- add_directory(library_dirs, "/usr/local/lib") - # FIXME: check /opt/stuff directories here? - - prefix = sysconfig.get_config_var("prefix") -@@ -199,22 +198,6 @@ - add_directory(include_dirs, include_root) - - # -- # add standard directories -- -- # look for tcl specific subdirectory (e.g debian) -- if _tkinter: -- tcl_dir = "/usr/include/tcl" + TCL_VERSION -- if os.path.isfile(os.path.join(tcl_dir, "tk.h")): -- add_directory(include_dirs, tcl_dir) -- -- # standard locations -- add_directory(library_dirs, "/usr/local/lib") -- add_directory(include_dirs, "/usr/local/include") -- -- add_directory(library_dirs, "/usr/lib") -- add_directory(include_dirs, "/usr/include") -- -- # - # insert new dirs *before* default libs, to avoid conflicts - # between Python PYD stub libs and real libraries - diff --git a/lib/addons/script.module.pil/Imaging-1.1.7-setuptools-0.1.patch b/lib/addons/script.module.pil/Imaging-1.1.7-setuptools-0.1.patch deleted file mode 100644 index a59ea79c5b956..0000000000000 --- a/lib/addons/script.module.pil/Imaging-1.1.7-setuptools-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Imaging-1.1.7/setup.py Imaging-1.1.7.patch/setup.py ---- Imaging-1.1.7/setup.py 2009-11-15 17:06:10.000000000 +0100 -+++ Imaging-1.1.7.patch/setup.py 2011-04-17 09:31:07.545708559 +0200 -@@ -83,7 +83,7 @@ - # -------------------------------------------------------------------- - - from distutils import sysconfig --from distutils.core import Extension, setup -+from setuptools import Extension, setup - from distutils.command.build_ext import build_ext - - try: diff --git a/lib/addons/script.module.pil/Makefile.in b/lib/addons/script.module.pil/Makefile.in deleted file mode 100644 index 0cc40f4dbc8cb..0000000000000 --- a/lib/addons/script.module.pil/Makefile.in +++ /dev/null @@ -1,58 +0,0 @@ - -OSTYPE=$(shell uname) -VERSION=1.1.7 -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -SOURCE=Imaging-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz - -RETRIEVE_TOOL=curl -RETRIEVE_TOOL_FLAGS=-Ls --output $(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -ifeq ($(OSTYPE),Darwin) -include @abs_top_srcdir@/tools/darwin/depends/Makefile.include -include @abs_top_srcdir@/tools/darwin/depends/config.site.mk -export TARBALLS_LOCATION=. -export PYTHONXCPREFIX=$(PREFIX) -export LDFLAGS+=-L$(PREFIX)/lib -PYTHON=$(TOOLCHAIN)/bin/python -PYTHONCROSS=--cross-compile -else -PYTHON=@PYTHON@ -endif - -NO_SYSTEM_PIL=$(shell $(PYTHON) -m Image >/dev/null 2>&1 || echo "1") - -DESTDIR=@abs_top_srcdir@/addons/script.module.pil/lib/PIL - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) $(DESTDIR) - -all: $(DESTDIR) - -ifeq (1,$(NO_SYSTEM_PIL)) -$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(ARCHIVE) - if test "$(OSTYPE)" = "Darwin"; then \ - cd $(SOURCE); \ - patch -p1 < ../Imaging-1.1.7-crosscompiling-0.1.patch; \ - patch -p1 < ../Imaging-1.1.7-setuptools-0.1.patch; \ - patch -p1 < ../Imaging-1.1.7-access.patch; \ - sed -ie "s|"darwin"|"darwinNot"|g" "setup.py"; \ - sed -ie "s|ZLIB_ROOT = None|ZLIB_ROOT = libinclude(\"${platform_sdk_path}/usr\")|" "setup.py"; \ - fi - -$(DESTDIR): $(SOURCE) - -rm -rf $(DESTDIR) - pushd $(SOURCE) && $(PYTHON) setup.py build $(PYTHONCROSS) --build-lib $(DESTDIR); popd -else -$(DESTDIR): - @true -endif - -include ../../../Makefile.include -