aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/electricsheep/files/patch-configure10
-rw-r--r--x11/electricsheep/files/patch-mpeg2dec_libvo_video_out_x11.c42
-rw-r--r--x11/electricsheep/files/patch-mpeg2dec_libvo_vroot.h14
3 files changed, 66 insertions, 0 deletions
diff --git a/x11/electricsheep/files/patch-configure b/x11/electricsheep/files/patch-configure
new file mode 100644
index 000000000000..9cbf0738c5e4
--- /dev/null
+++ b/x11/electricsheep/files/patch-configure
@@ -0,0 +1,10 @@
+--- mpeg2dec/configure.orig Thu Jun 12 21:31:41 2003
++++ mpeg2dec/configure Thu Jun 12 21:32:01 2003
+@@ -7842,6 +7842,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='${SHELL} /usr/local/bin/libtool'
diff --git a/x11/electricsheep/files/patch-mpeg2dec_libvo_video_out_x11.c b/x11/electricsheep/files/patch-mpeg2dec_libvo_video_out_x11.c
new file mode 100644
index 000000000000..5099440bbe92
--- /dev/null
+++ b/x11/electricsheep/files/patch-mpeg2dec_libvo_video_out_x11.c
@@ -0,0 +1,42 @@
+--- mpeg2dec/libvo/video_out_x11.c.orig Fri Jun 6 02:15:57 2003
++++ mpeg2dec/libvo/video_out_x11.c Sun Jan 25 00:03:30 2004
+@@ -235,7 +235,9 @@
+ /* this would break the solaris port though :-/ */
+
+ /* fuck solaris, plug the leak! */
++#ifndef __FreeBSD__
+ shmctl(instance->shminfo.shmid, IPC_RMID, 0);
++#endif
+
+ /* XShmAttach fails on remote displays, so we have to catch this event */
+
+@@ -254,6 +256,9 @@
+ return NULL;
+ }
+
++#ifdef __FreeBSD__
++ shmctl(instance->shminfo.shmid, IPC_RMID, 0);
++#endif
+ return instance->shminfo.shmaddr;
+ }
+
+@@ -640,6 +645,9 @@
+ if (instance == NULL)
+ return NULL;
+
++#ifdef __FreeBSD__
++ memset(instance, 0, sizeof(*instance));
++#endif
+ instance->vo.setup = x11_setup;
+ return (vo_instance_t *) instance;
+ }
+@@ -658,6 +666,9 @@
+ if (instance == NULL)
+ return NULL;
+
++#ifdef __FreeBSD__
++ memset(instance, 0, sizeof(*instance));
++#endif
+ instance->vo.setup = xv_setup;
+ return (vo_instance_t *) instance;
+ }
diff --git a/x11/electricsheep/files/patch-mpeg2dec_libvo_vroot.h b/x11/electricsheep/files/patch-mpeg2dec_libvo_vroot.h
new file mode 100644
index 000000000000..0d05f50a065b
--- /dev/null
+++ b/x11/electricsheep/files/patch-mpeg2dec_libvo_vroot.h
@@ -0,0 +1,14 @@
+--- mpeg2dec/libvo/vroot.h.orig Thu Dec 12 04:33:33 2002
++++ mpeg2dec/libvo/vroot.h Sun Jan 25 00:42:03 2004
+@@ -98,7 +98,11 @@
+ __SWM_VROOT, 0, 1, False, XA_WINDOW,
+ &actual_type, &actual_format,
+ &nitems, &bytesafter,
++#ifdef __FreeBSD__
++ (void *)&newRoot) == Success
++#else
+ (unsigned char **) &newRoot) == Success
++#endif
+ && newRoot) {
+ root = *newRoot;
+ break;