aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRechi <Rechi@users.noreply.github.com>2019-06-13 14:22:31 +0200
committerRechi <Rechi@users.noreply.github.com>2019-06-13 14:22:31 +0200
commit4a510ebf991b56c8279c82643e0dd53de90776f6 (patch)
tree5c843ffbd32836b03414638641db774a40a485e8
parent715c24f6385ebc426202db300923559502ce9391 (diff)
[depends] refresh libcdio patches
-rw-r--r--tools/depends/target/libcdio/Makefile4
-rw-r--r--tools/depends/target/libcdio/configure.patch8
-rw-r--r--tools/depends/target/libcdio/cross.patch4
3 files changed, 8 insertions, 8 deletions
diff --git a/tools/depends/target/libcdio/Makefile b/tools/depends/target/libcdio/Makefile
index bb22816196..57da8e5d1d 100644
--- a/tools/depends/target/libcdio/Makefile
+++ b/tools/depends/target/libcdio/Makefile
@@ -22,8 +22,8 @@ $(TARBALLS_LOCATION)/$(ARCHIVE):
$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- cd $(PLATFORM); patch -p0 < ../configure.patch
- cd $(PLATFORM); patch -p0 < ../cross.patch
+ cd $(PLATFORM); patch -p1 -i ../configure.patch
+ cd $(PLATFORM); patch -p1 -i ../cross.patch
cd $(PLATFORM); $(AUTORECONF) -vif
cd $(PLATFORM); $(CONFIGURE)
diff --git a/tools/depends/target/libcdio/configure.patch b/tools/depends/target/libcdio/configure.patch
index a4110ef9cb..b0f7274531 100644
--- a/tools/depends/target/libcdio/configure.patch
+++ b/tools/depends/target/libcdio/configure.patch
@@ -1,8 +1,8 @@
---- configure.ac 2012-05-27 15:06:13.044747493 -0400
-+++ configure.ac 2012-05-27 15:05:52.364747505 -0400
-@@ -378,7 +378,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -407,7 +407,7 @@
;;
- linux*|uclinux)
+ linux*)
AC_CHECK_HEADERS(linux/version.h linux/major.h)
- AC_CHECK_HEADERS(linux/cdrom.h, [have_linux_cdrom_h="yes"])
+ AC_CHECK_HEADERS(linux/cdrom.h, [have_linux_cdrom_h="no"])
diff --git a/tools/depends/target/libcdio/cross.patch b/tools/depends/target/libcdio/cross.patch
index d5e17cecda..e1e564bfdd 100644
--- a/tools/depends/target/libcdio/cross.patch
+++ b/tools/depends/target/libcdio/cross.patch
@@ -1,5 +1,5 @@
---- configure.ac 2013-03-10 19:25:36.396466337 -0400
-+++ configure.ac 2013-03-10 19:24:34.906466376 -0400
+--- a/configure.ac
++++ b/configure.ac
@@ -269,37 +269,6 @@
fi
dnl empty_array_size