cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove work-around for ld.so bug that was fixed just before 3.4

Browse Source
This commit is contained in:
espie 2003-09-28 10:56:04 +00:00
parent 38ee9f9ce1
commit 2ce0d7d06f
2 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
x11/vlc/patches/patch-modules_video_output_x11_xcommon_c
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-modules_video_output_x11_xcommon_c,v 1.2 2003/08/22 21:32:46 espie Exp $
--- modules/video_output/x11/xcommon.c.orig 2003-08-13 20:39:52.000000000 +0200
+++ modules/video_output/x11/xcommon.c 2003-08-22 22:38:41.000000000 +0200
@@ -75,8 +75,13 @@
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+#ifdef MODULE_NAME_IS_xvideo
+int E_(XVActivate) ( vlc_object_t * );
+void E_(XVDeactivate) ( vlc_object_t * );
+#else
int E_(Activate) ( vlc_object_t * );
void E_(Deactivate) ( vlc_object_t * );
+#endif
static int InitVideo ( vout_thread_t * );
static void EndVideo ( vout_thread_t * );
@@ -126,7 +131,11 @@ static void TestNetWMSupport( vout_threa
* vout properties to choose the window size, and change them according to the
* actual properties of the display.
*****************************************************************************/
+#ifdef MODULE_NAME_IS_xvideo
+int E_(XVActivate) ( vlc_object_t *p_this )
+#else
int E_(Activate) ( vlc_object_t *p_this )
+#endif
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
char * psz_display;
@@ -281,7 +295,11 @@ int E_(Activate) ( vlc_object_t *p_this
*****************************************************************************
* Terminate an output method created by Open
*****************************************************************************/
+#ifdef MODULE_NAME_IS_xvideo
+void E_(XVDeactivate) ( vlc_object_t *p_this )
+#else
void E_(Deactivate) ( vlc_object_t *p_this )
+#endif
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;

29
x11/vlc/patches/patch-modules_video_output_x11_xvideo_c
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-modules_video_output_x11_xvideo_c,v 1.1 2003/08/22 20:51:49 espie Exp $
--- modules/video_output/x11/xvideo.c.orig 2003-08-22 22:23:17.000000000 +0200
+++ modules/video_output/x11/xvideo.c 2003-08-22 22:27:14.000000000 +0200
@@ -35,8 +35,13 @@
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
+#ifdef MODULE_NAME_IS_xvideo
+extern int E_(XVActivate) ( vlc_object_t * );
+extern void E_(XVDeactivate) ( vlc_object_t * );
+#else
extern int E_(Activate) ( vlc_object_t * );
extern void E_(Deactivate) ( vlc_object_t * );
+#endif
/*****************************************************************************
* Module descriptor
@@ -89,7 +94,11 @@ vlc_module_begin();
set_description( _("XVideo extension video output") );
set_capability( "video output", 150 );
+#ifdef MODULE_NAME_IS_xvideo
+ set_callbacks( E_(XVActivate), E_(XVDeactivate) );
+#else
set_callbacks( E_(Activate), E_(Deactivate) );
+#endif
vlc_module_end();
/* following functions are local */