summaryrefslogtreecommitdiffstats
path: root/multimedia/libdv/files
diff options
context:
space:
mode:
authorlioux <lioux@FreeBSD.org>2001-11-21 06:06:46 +0000
committerlioux <lioux@FreeBSD.org>2001-11-21 06:06:46 +0000
commit664bdcc224df74e12c3503d0e391d7e69674773d (patch)
tree8af35be1c7ac2d89492b8d19c120d3192664d752 /multimedia/libdv/files
parentce7bfb64df7cfc9dfe1930e22c8e3b1874f7bbeb (diff)
downloadFreeBSD-ports-664bdcc224df74e12c3503d0e391d7e69674773d.zip
FreeBSD-ports-664bdcc224df74e12c3503d0e391d7e69674773d.tar.gz
o Add missing USE_XLIB
o Really have SDL support unless WITHOUT_SDL o Add patch-playdv:display.h to support SDL o Improve patch-playdv:display.c from PR o Install additional documentation unless NOPORTDOCS (not from PR) PR: 31732 Submitted by: Matthew Reimer <mreimer@vpop.net>
Diffstat (limited to 'multimedia/libdv/files')
-rw-r--r--multimedia/libdv/files/patch-playdv:display.c20
-rw-r--r--multimedia/libdv/files/patch-playdv:display.h13
2 files changed, 27 insertions, 6 deletions
diff --git a/multimedia/libdv/files/patch-playdv:display.c b/multimedia/libdv/files/patch-playdv:display.c
index 02b0a85..37e672d 100644
--- a/multimedia/libdv/files/patch-playdv:display.c
+++ b/multimedia/libdv/files/patch-playdv:display.c
@@ -1,29 +1,37 @@
---- playdv/display.c.orig Sun Jun 24 13:06:30 2001
-+++ playdv/display.c Mon Nov 19 00:37:55 2001
+--- playdv/display.c.orig Wed Nov 21 03:47:29 2001
++++ playdv/display.c Wed Nov 21 03:51:04 2001
@@ -47,6 +47,8 @@
#include <popt.h>
#endif
-+dv_display_t *dv_dpy_on_exit_hack;
++dv_display_t *dv_dpy_on_exit_hack = NULL;
+
static int dv_display_SDL_init(dv_display_t *dv_dpy, gchar *w_name, gchar *i_name );
static gboolean dv_display_gdk_init(dv_display_t *dv_dpy, gint *argc, gchar ***argv );
-@@ -675,6 +677,13 @@
+@@ -257,6 +259,7 @@
+ } /* switch */
+
+ free(dv_dpy);
++ dv_dpy_on_exit_hack = NULL;
+ } /* dv_display_exit */
+
+ static gboolean
+@@ -675,6 +678,13 @@
} /* if */
} /* dv_display_exit_handler */
+static void
+dv_display_on_exit_hack_handler()
+{
-+ if(dv_dpy_on_exit_hack) {
++ if(dv_dpy_on_exit_hack != NULL) {
+ dv_display_exit(dv_dpy_on_exit_hack);
+ } /* if */
+} /* dv_display_exit_handler */
gboolean
dv_display_init(dv_display_t *dv_dpy, gint *argc, gchar ***argv, gint width, gint height,
-@@ -804,7 +813,8 @@
+@@ -804,7 +814,8 @@
fprintf(stderr, " Using gtk for display\n");
ok:
diff --git a/multimedia/libdv/files/patch-playdv:display.h b/multimedia/libdv/files/patch-playdv:display.h
new file mode 100644
index 0000000..a734cd1
--- /dev/null
+++ b/multimedia/libdv/files/patch-playdv:display.h
@@ -0,0 +1,13 @@
+--- playdv/display.h.orig Sun Jun 24 13:06:30 2001
++++ playdv/display.h Wed Nov 21 03:52:21 2001
+@@ -38,8 +38,8 @@
+ #endif // HAVE_LIBXV
+
+ #if HAVE_SDL
+-#include <SDL/SDL.h>
+-#include <SDL/SDL_syswm.h>
++#include <SDL.h>
++#include <SDL_syswm.h>
+ #endif // HAVE_SDL
+
+ #if HAVE_GTK
OpenPOWER on IntegriCloud