diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-18 01:51:23 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-18 01:51:23 +0800 |
| commit | 2d33609538572c7ad423ea9fd55c791436e87c0b (patch) | |
| tree | a074def112f03c96836bbcee97cd4030150311c6 /audio | |
| parent | 0f0ffe89a95fd37625fab57d588562764e20e804 (diff) | |
| download | marcuscom-ports-2d33609538572c7ad423ea9fd55c791436e87c0b.tar.gz marcuscom-ports-2d33609538572c7ad423ea9fd55c791436e87c0b.tar.zst marcuscom-ports-2d33609538572c7ad423ea9fd55c791436e87c0b.zip | |
Fix build on -STABLE, and clean up the Makefile some.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1340 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/marlin/Makefile | 7 | ||||
| -rw-r--r-- | audio/marlin/files/patch-marlin_marlin-sample-view.c | 12 | ||||
| -rw-r--r-- | audio/marlin/files/patch-src_marlin-cdda-record.c | 11 |
3 files changed, 26 insertions, 4 deletions
diff --git a/audio/marlin/Makefile b/audio/marlin/Makefile index e2c1ad9b8..3d7f9015a 100644 --- a/audio/marlin/Makefile +++ b/audio/marlin/Makefile @@ -19,11 +19,10 @@ LIB_DEPENDS= gstplay-0.7.1:${PORTSDIR}/multimedia/gstreamer-plugins \ USE_X_PREFIX= yes USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix gnomehack +USE_GNOME= gnomeprefix gnomehack gnometarget INSTALLS_SHLIB= yes USE_LIBTOOL= yes -USE_REINPLACE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib -lcam" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -lcam" .include <bsd.port.mk> diff --git a/audio/marlin/files/patch-marlin_marlin-sample-view.c b/audio/marlin/files/patch-marlin_marlin-sample-view.c new file mode 100644 index 000000000..71a617693 --- /dev/null +++ b/audio/marlin/files/patch-marlin_marlin-sample-view.c @@ -0,0 +1,12 @@ +--- marlin/marlin-sample-view.c.orig Mon Nov 17 12:40:57 2003 ++++ marlin/marlin-sample-view.c Mon Nov 17 12:41:18 2003 +@@ -1615,8 +1615,8 @@ + #endif + if (red_dotted == NULL) { + GdkColor red = {0, 65535, 0, 0}; +- red_dotted = gdk_gc_new (widget->window); + GdkColormap *cmap = gdk_colormap_get_system (); ++ red_dotted = gdk_gc_new (widget->window); + + gdk_gc_copy (red_dotted, widget->style->black_gc); + diff --git a/audio/marlin/files/patch-src_marlin-cdda-record.c b/audio/marlin/files/patch-src_marlin-cdda-record.c new file mode 100644 index 000000000..2420b3909 --- /dev/null +++ b/audio/marlin/files/patch-src_marlin-cdda-record.c @@ -0,0 +1,11 @@ +--- src/marlin-cdda-record.c.orig Mon Nov 17 12:45:49 2003 ++++ src/marlin-cdda-record.c Mon Nov 17 12:46:17 2003 +@@ -506,7 +506,7 @@ + if (res) { + if (i > 0) { + char *start_str, *finish_str, *length_str; +- gint64 length = time - time_count;; ++ gint64 length = time - time_count; + char *full; + + cdda->track_starts[i] = time; |