[vlc-devel] commit: contrib/libcaca: removed no longer needed patches ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Oct 27 18:21:55 2009 +0100| [72b2befbe2bfbf91bc1ff45b11c273cf22bc15d7] | committer: Felix Paul Kühne 

contrib/libcaca: removed no longer needed patches

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

 extras/contrib/src/Makefile                        |    3 -
 .../contrib/src/Patches/libcaca_driver_cocoa.diff  |   53 --------------------
 extras/contrib/src/Patches/libcaca_macosx.diff     |   13 -----
 3 files changed, 0 insertions(+), 69 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f8e411e..d14a371 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1292,9 +1292,6 @@ libcaca: libcaca-$(LIBCACA_VERSION).tar.gz
 	$(EXTRACT_GZ)
 	patch -p0 < Patches/libcaca-static.patch
 ifdef HAVE_DARWIN_OS
-	#remove me at next libcaca upgrade
-	patch -p0 < Patches/libcaca_driver_cocoa.diff
-	patch -p0 < Patches/libcaca_macosx.diff
 	patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch
 	(cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig  configure)
 endif
diff --git a/extras/contrib/src/Patches/libcaca_driver_cocoa.diff b/extras/contrib/src/Patches/libcaca_driver_cocoa.diff
deleted file mode 100644
index 13a74e0..0000000
--- a/extras/contrib/src/Patches/libcaca_driver_cocoa.diff
+++ /dev/null
@@ -1,53 +0,0 @@
---- libcaca-0.99.beta13b/caca/driver_cocoa.m	2007-11-25 15:00:34.000000000 +0100
-+++ libcaca/caca/driver_cocoa.m	2008-01-21 17:39:14.000000000 +0100
-@@ -3,7 +3,7 @@
-  *  Copyright (c) 2006 Colin Delacroix <colin at zoy.org>
-  *                All Rights Reserved
-  *
-- *  $Id$
-+ *  $Id: driver_cocoa.m 1445 2007-12-16 01:50:41Z sam $
-  *
-  *  This library is free software. It comes without any warranty, to
-  *  the extent permitted by applicable law. You can redistribute it
-@@ -722,7 +722,7 @@
-     return caca_keycode;
- }
- 
--static BOOL handle_key_event(struct caca_event *ev, NSEvent* event)
-+static BOOL handle_key_event(caca_privevent_t *ev, NSEvent* event)
- {
-     if(!ev || !event)
-         return NO;
-@@ -774,7 +774,7 @@
- }
- 
- // TODO: handle CACA_EVENT_RESIZE
--static BOOL handle_mouse_event(caca_display_t *dp, struct caca_event *ev,
-+static BOOL handle_mouse_event(caca_display_t *dp, caca_privevent_t *ev,
-                                NSEvent* event)
- {
-     if(!ev || !event)
-@@ -884,7 +884,7 @@
-     [pool release];
- }
- 
--static int cocoa_get_event(caca_display_t *dp, struct caca_event *ev)
-+static int cocoa_get_event(caca_display_t *dp, caca_privevent_t *ev)
- {
-     if(s_quit)
-     {
-@@ -970,12 +970,12 @@
-     return 0;
- }
- 
--static unsigned int cocoa_get_display_width(caca_display_t *dp)
-+static unsigned int cocoa_get_display_width(caca_display_t const *dp)
- {
-     return [dp->drv.p->window frame].size.width;
- }
- 
--static unsigned int cocoa_get_display_height(caca_display_t *dp)
-+static unsigned int cocoa_get_display_height(caca_display_t const *dp)
- {
-     return [dp->drv.p->window frame].size.height;
- }
diff --git a/extras/contrib/src/Patches/libcaca_macosx.diff b/extras/contrib/src/Patches/libcaca_macosx.diff
deleted file mode 100644
index eac0d02..0000000
--- a/extras/contrib/src/Patches/libcaca_macosx.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/mygetopt.c
-===================================================================
---- libcaca.orig/src/mygetopt.c	(révision 1516)
-+++ libcaca/src/mygetopt.c	(copie de travail)
-@@ -25,7 +25,7 @@
- #endif
- 
- /* DOS / Kernel driver */
--#ifndef __intptr_t_defined
-+#if !defined(__intptr_t_defined) && !defined(_UINTPTR_T)
- typedef unsigned int		uintptr_t;
- #endif
-