summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2010-04-27 10:21:08 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2010-04-27 10:21:08 (GMT)
commit8de862b19d3e630c7e6883c442a81fa964c6d0fa (patch)
treec9897cdde518dd507af5e9d98b6daf4475db9916 /src
parent73e43052385697d19f862801743b0a6bebfea747 (diff)
downloadmxe-8de862b19d3e630c7e6883c442a81fa964c6d0fa.zip
mxe-8de862b19d3e630c7e6883c442a81fa964c6d0fa.tar.gz
mxe-8de862b19d3e630c7e6883c442a81fa964c6d0fa.tar.bz2
improved patch for package xine-lib
Diffstat (limited to 'src')
-rw-r--r--src/xine-lib-1-do-not-install-def-file.patch33
-rw-r--r--src/xine-lib-1-fix-install-def-file.patch35
2 files changed, 35 insertions, 33 deletions
diff --git a/src/xine-lib-1-do-not-install-def-file.patch b/src/xine-lib-1-do-not-install-def-file.patch
deleted file mode 100644
index 7e98167..0000000
--- a/src/xine-lib-1-do-not-install-def-file.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -r 42ff50f9d875 src/xine-engine/Makefile.am
---- a/src/xine-engine/Makefile.am Mon Apr 26 17:53:49 2010 +0200
-+++ b/src/xine-engine/Makefile.am Mon Apr 26 17:56:06 2010 +0200
-@@ -43,13 +43,5 @@
-
- noinst_HEADERS = bswap.h ffmpeg_bswap.h
-
--if WIN32
--install-exec-local:
-- cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
--
--uninstall-local:
-- rm -f $(DEF_FILE)
--endif
--
- $(XINEUTILS_LIB):
- $(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
-diff -r 42ff50f9d875 src/xine-engine/Makefile.in
---- a/src/xine-engine/Makefile.in Mon Apr 26 17:53:49 2010 +0200
-+++ b/src/xine-engine/Makefile.in Mon Apr 26 17:56:06 2010 +0200
-@@ -897,12 +897,6 @@
- $(LIBXINEPOSIX):
- $(MAKE) -C $(top_builddir)/lib libxineposix.la
-
--@WIN32_TRUE@install-exec-local:
--@WIN32_TRUE@ cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
--
--@WIN32_TRUE@uninstall-local:
--@WIN32_TRUE@ rm -f $(DEF_FILE)
--
- $(XINEUTILS_LIB):
- $(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
-
diff --git a/src/xine-lib-1-fix-install-def-file.patch b/src/xine-lib-1-fix-install-def-file.patch
new file mode 100644
index 0000000..cb2500b
--- /dev/null
+++ b/src/xine-lib-1-fix-install-def-file.patch
@@ -0,0 +1,35 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+diff -r 42ff50f9d875 src/xine-engine/Makefile.am
+--- a/src/xine-engine/Makefile.am Mon Apr 26 17:53:49 2010 +0200
++++ b/src/xine-engine/Makefile.am Tue Apr 27 11:57:54 2010 +0200
+@@ -45,10 +45,10 @@
+
+ if WIN32
+ install-exec-local:
+- cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
++ -cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
+
+ uninstall-local:
+- rm -f $(DEF_FILE)
++ -rm -f $(DESTDIR)$(libdir)/$(DEF_FILE)
+ endif
+
+ $(XINEUTILS_LIB):
+diff -r 42ff50f9d875 src/xine-engine/Makefile.in
+--- a/src/xine-engine/Makefile.in Mon Apr 26 17:53:49 2010 +0200
++++ b/src/xine-engine/Makefile.in Tue Apr 27 11:57:54 2010 +0200
+@@ -898,10 +898,10 @@
+ $(MAKE) -C $(top_builddir)/lib libxineposix.la
+
+ @WIN32_TRUE@install-exec-local:
+-@WIN32_TRUE@ cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
++@WIN32_TRUE@ -cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
+
+ @WIN32_TRUE@uninstall-local:
+-@WIN32_TRUE@ rm -f $(DEF_FILE)
++@WIN32_TRUE@ -rm -f $(DESTDIR)$(libdir)/$(DEF_FILE)
+
+ $(XINEUTILS_LIB):
+ $(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la