[vlc-devel] commit: contrib: correct patch apply (Derk-Jan Hartman )

git version control git at videolan.org
Tue Jun 16 20:20:57 CEST 2009


vlc | branch: 1.0-bugfix | Derk-Jan Hartman <hartman at videolan.org> | Tue Jun 16 15:51:47 2009 +0200| [84d6c647650ecc8180ae28b0b8b95bf5ce6da123] | committer: Derk-Jan Hartman 

contrib: correct patch apply
(cherry picked from commit a6fdca45722cc5e4a4c5329f98e62606857fd62b)

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=84d6c647650ecc8180ae28b0b8b95bf5ce6da123
---

 extras/contrib/src/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index be6263e..6ce07a5 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2553,7 +2553,7 @@ libass-$(ASS_VERSION).tar.bz2:
 # mplayer patches up to August 8, 2008 are included
 libass: libass-$(ASS_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	patch -p0 < Patches/libass_mplayer_updates.patch
+	(cd $@; patch -p1 < ../Patches/libass_mplayer_updates.patch)
 ifneq ($(HOST),$(BUILD))
 	patch -p0 < Patches/libass-cross.patch
 	(cd $@; autoreconf; automake)




More information about the vlc-devel mailing list