aboutsummaryrefslogtreecommitdiff
path: root/tools/depends
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2018-09-14 10:00:00 +0200
committerMemphiz <memphis@machzwo.de>2018-09-14 10:00:00 +0200
commit0827ea69592cdd2658a42f4a2c99d4e47c23582a (patch)
tree289f023cd201c6c1e082bc524968ffc10aafcdfb /tools/depends
parent28d6417426ce3ec4c3449150a2be493d79619b37 (diff)
[ios] - enable dvdcss (allows encrypted dvd playback on ios)
Diffstat (limited to 'tools/depends')
-rw-r--r--tools/depends/target/Makefile6
-rw-r--r--tools/depends/target/libdvdread/Makefile10
2 files changed, 5 insertions, 11 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index b5e91c1734..0c525401e6 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -27,13 +27,11 @@ else
endif
ifeq ($(OS),ios)
- EXCLUDED_DEPENDS = libcec libusb libdvdcss
+ EXCLUDED_DEPENDS = libcec libusb
ifeq ($(TARGET_PLATFORM),appletvos)
DEPENDS += boblight
endif
DEPENDS += iosentitlements
-else
- DVDREAD_DEPS = libdvdcss
endif
ifeq ($(OS),osx)
@@ -115,7 +113,7 @@ platform: p8-platform
libcec: p8-platform
crossguid: $(CROSSGUID_DEPS)
libdvdnav: libdvdread
-libdvdread: $(DVDREAD_DEPS)
+libdvdread: libdvdcss
wayland: expat libffi
waylandpp: wayland $(WAYLANDPP_DEPS)
dbus: expat
diff --git a/tools/depends/target/libdvdread/Makefile b/tools/depends/target/libdvdread/Makefile
index 0c50a6d312..e9fd9b10a4 100644
--- a/tools/depends/target/libdvdread/Makefile
+++ b/tools/depends/target/libdvdread/Makefile
@@ -3,8 +3,8 @@ include DVDREAD-VERSION
DEPS = DVDREAD-VERSION Makefile
# configuration settings
-config = --prefix=$(PREFIX) --disable-shared --enable-static --with-pic
-EXTRA_CFLAGS = -D_XBMC
+config = --prefix=$(PREFIX) --disable-shared --enable-static --with-pic --with-libdvdcss
+EXTRA_CFLAGS = -D_XBMC -DHAVE_DVDCSS_DVDCSS_H
ifeq ($(CROSS_COMPILING), yes)
DEPS += ../../Makefile.include
@@ -21,15 +21,11 @@ else
endif
endif
-ifneq ($(OS),ios)
- config += --with-libdvdcss
- EXTRA_CFLAGS += -DHAVE_DVDCSS_DVDCSS_H
-endif
ifeq ($(OS),osx)
EXTRA_CFLAGS += -D__DARWIN__
endif
ifeq ($(OS),ios)
- EXTRA_CFLAGS += -D__DARWIN__ -UHAVE_DVDCSS_DVDCSS_H
+ EXTRA_CFLAGS += -D__DARWIN__
endif
RETRIEVE_TOOL := curl -Ls --create-dirs --retry 10 --retry-delay 3