Mercurial > mxe-octave

changeset 915:43389b74773e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved patch for package xine-lib
author Volker Grabsch <vog@notjusthosting.com>
date Tue, 27 Apr 2010 12:21:08 +0200
parents ea9734b40ea5
children 2ae2b8ee4c18
files src/xine-lib-1-do-not-install-def-file.patch src/xine-lib-1-fix-install-def-file.patch
diffstat 2 files changed, 35 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/src/xine-lib-1-do-not-install-def-file.patch	Tue Apr 27 10:50:05 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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
- 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xine-lib-1-fix-install-def-file.patch	Tue Apr 27 12:21:08 2010 +0200
@@ -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