diff options
| -rw-r--r-- | cmake/modules/FindUdfread.cmake | 2 | ||||
| -rw-r--r-- | tools/depends/target/Makefile | 4 | ||||
| -rw-r--r-- | tools/depends/target/udfread/Makefile (renamed from tools/depends/target/libudfread/Makefile) | 5 | ||||
| -rw-r--r-- | tools/depends/target/udfread/UDFREAD-VERSION (renamed from tools/depends/target/libudfread/LIBUDFREAD-VERSION) | 4 |
4 files changed, 7 insertions, 8 deletions
diff --git a/cmake/modules/FindUdfread.cmake b/cmake/modules/FindUdfread.cmake index 9428557812..02ff8411dc 100644 --- a/cmake/modules/FindUdfread.cmake +++ b/cmake/modules/FindUdfread.cmake @@ -14,7 +14,7 @@ if(ENABLE_INTERNAL_UDFREAD) include(ExternalProject) include(cmake/scripts/common/ModuleHelpers.cmake) - set(MODULE_LC libudfread) + set(MODULE_LC udfread) SETUP_BUILD_VARS() diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index 973ed74660..83487c100c 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -40,7 +40,6 @@ DEPENDS = \ libplist \ libpng \ libshairplay \ - libudfread \ libusb \ libxml2 \ libxslt \ @@ -59,6 +58,7 @@ DEPENDS = \ sqlite3 \ taglib \ tinyxml \ + udfread \ xz ifeq ($(ENABLE_GPLV3),yes) @@ -144,7 +144,7 @@ gettext: $(ICONV) gnutls: nettle $(ZLIB) harfbuzz: meson-cross-file freetype2-noharfbuzz $(ICONV) libass: fontconfig fribidi harfbuzz libpng freetype2 expat $(ICONV) -libbluray: fontconfig freetype2 $(ICONV) libudfread libxml2 +libbluray: fontconfig freetype2 $(ICONV) udfread libxml2 libcdio-gplv3: $(ICONV) libcdio: $(ICONV) libcec: p8-platform diff --git a/tools/depends/target/libudfread/Makefile b/tools/depends/target/udfread/Makefile index 1d374e8db6..682f782b5a 100644 --- a/tools/depends/target/libudfread/Makefile +++ b/tools/depends/target/udfread/Makefile @@ -1,6 +1,6 @@ -include ../../Makefile.include -include LIBUDFREAD-VERSION -DEPS = Makefile LIBUDFREAD-VERSION ../../download-files.include ../../download-files.include +include UDFREAD-VERSION +DEPS = Makefile UDFREAD-VERSION ../../download-files.include ../../download-files.include ifeq ($(CROSS_COMPILING), yes) DEPS += ../../Makefile.include @@ -22,7 +22,6 @@ LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a all: .installed-$(PLATFORM) download: $(TARBALLS_LOCATION)/$(ARCHIVE) - $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) diff --git a/tools/depends/target/libudfread/LIBUDFREAD-VERSION b/tools/depends/target/udfread/UDFREAD-VERSION index 0073a20148..a76ccdedfb 100644 --- a/tools/depends/target/libudfread/LIBUDFREAD-VERSION +++ b/tools/depends/target/udfread/UDFREAD-VERSION @@ -1,4 +1,4 @@ -LIBNAME=libudfread +LIBNAME=udfread VERSION=1.1.2 -ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +ARCHIVE=lib$(LIBNAME)-$(VERSION).tar.gz SHA512=3069feb5db40288beb5b112b285186162a704f0fdd3cf67a17fd4eeea015f2cfcfbb455b7aa7c3d79d00fd095a3fd11cffc7b121dce94d99c3b06a509a8977d2 |