summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2013-01-05 12:17:16 +0000
committerobache <obache@pkgsrc.org>2013-01-05 12:17:16 +0000
commit37870ba0c9403d3d01e720e9375457e0df692efb (patch)
tree616f786cdf14acfe78931f2ea0db970f7fae0537
parentd753415ab7254f25c9114ac28c827850a8e04131 (diff)
downloadpkgsrc-37870ba0c9403d3d01e720e9375457e0df692efb.tar.gz
Update gmtk to 1.0.7.
1.0.7 Rerun autoreconf -fiv 1.0.7b Make 'o' toggle the OSD in gmtk_media_player Update makefile so that libgmtk is dependent on libgmlib so that parallel builds work Updated Polish translation Add anamorphic aspect ratio (2.39:1) Fix problem with audio only file restarts in gmtk_media_player gnome-mplayer Issue #634 Clean up double setting of media_device in gmtk_media_player Add subtitle step forward and backward commands Basic scrolling wheel patch from Gnome Mplayer Issue #621 Don't flush events when querying devices Cleanup GTK depreciated warnings in gmtk_media_tracker Cleanup gtk_widget_get_pointer depreciated warning on GTK 3.4 Version the libraries that are built Change error message dialog in thread_reader_error to event that is raised, let the front end handle it add gm_bool_to_string() macro (use like a function returning const gchar*) Clear artist, title and album on media end, prevents wrong cover art lookup Change gmtk_media_player_log_state log level from DEBUG to INFO Move and add gmtk_media_player_log_state status messages around Prevent class cast on possible NULL pointer Emit mplayer_complete_cond anytime we find an error reading from the mplayer thread new function gm_log_name_this_thread(): improves thread logging Fix usage of status in thread_reader_error correctly Clean up the pointer math in gmtk_media_player_log_state Clean up some memory allocations identified by valgrind Print thread number with all debug messages if GM_DEBUG_THREADS is set Change strchr to g_strrstr in gm_log Uppercase constant GMPLS_LEN Define the player_lock mutex Fix a double free at program exit time (removes an occasional segfault) Initialize a struct to 0 to remove "branch depends on uninitialized memory" error Fix "pointer to object on stack passed out of function" bug. Add a function attribute, so calls to gm_log() are checked for printf format string errors Hook gm_log functions into the remainder of the sources Hook functions from gm_log into the main gmtk_media_player class, add log_state method Make gm_log.c/,h compatible with indent Fix compile error in gm_log Adjust formatting in gm_log files to match up with rest of project Add in gm_log from Hans Ecke Return a NULL instead of a "" string for metadata Apply patch from Issue #9 to fix some cppcheck warnings Fix a couple of keyboard shortcuts as they were in the wrong shift state, similar to gnome-mplayer fix Initialize some media metadata Change some minor video initialization setup steps Implement getting ATTRIBUTE_SPEED_SET Fix problem with removal of read metadata and replacing it with filename info Fix compiler warning detected by clang Monitor sub visiblity better gnome-mplayer Issue #615 Protect against possible divide by zero in gmtk_media_player_size_allocate Correct situation where media player window allocation is small or incorrect If mplayer emits a signal at position 0 retry once Fix logic error in ERROR_RETRY Replace g_strncasecmp with g_ascii_strncasecmp
-rw-r--r--devel/gmtk/Makefile5
-rw-r--r--devel/gmtk/PLIST3
-rw-r--r--devel/gmtk/buildlink3.mk4
-rw-r--r--devel/gmtk/distinfo10
-rw-r--r--devel/gmtk/patches/patch-src_Makefile.am16
-rw-r--r--devel/gmtk/patches/patch-src_Makefile.in27
6 files changed, 55 insertions, 10 deletions
diff --git a/devel/gmtk/Makefile b/devel/gmtk/Makefile
index 1d97425a109..3be0dde9837 100644
--- a/devel/gmtk/Makefile
+++ b/devel/gmtk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2012/11/03 01:58:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2013/01/05 12:17:16 obache Exp $
#
-DISTNAME= gmtk-1.0.6
-PKGREVISION= 6
+DISTNAME= gmtk-1.0.7
CATEGORIES= devel
MASTER_SITES= http://gmtk.googlecode.com/files/
diff --git a/devel/gmtk/PLIST b/devel/gmtk/PLIST
index b57c26a0ca5..d1700d5ffcb 100644
--- a/devel/gmtk/PLIST
+++ b/devel/gmtk/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/13 12:57:33 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/01/05 12:17:16 obache Exp $
include/gmtk/gm_audio.h
include/gmtk/gm_common.h
include/gmtk/gm_file.h
+include/gmtk/gm_log.h
include/gmtk/gm_parse.h
include/gmtk/gm_pref_store.h
include/gmtk/gm_strfuncs.h
diff --git a/devel/gmtk/buildlink3.mk b/devel/gmtk/buildlink3.mk
index ff21439ba81..b619c8da2eb 100644
--- a/devel/gmtk/buildlink3.mk
+++ b/devel/gmtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/11/03 01:58:32 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2013/01/05 12:17:16 obache Exp $
#
BUILDLINK_TREE+= gmtk
@@ -7,7 +7,7 @@ BUILDLINK_TREE+= gmtk
GMTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gmtk+= gmtk>=1.0.6
-BUILDLINK_ABI_DEPENDS.gmtk?= gmtk>=1.0.6nb6
+BUILDLINK_ABI_DEPENDS.gmtk+= gmtk>=1.0.7
BUILDLINK_PKGSRCDIR.gmtk?= ../../devel/gmtk
pkgbase := gmtk
diff --git a/devel/gmtk/distinfo b/devel/gmtk/distinfo
index a6da519dbfd..4678cb3a067 100644
--- a/devel/gmtk/distinfo
+++ b/devel/gmtk/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2012/04/13 12:57:33 obache Exp $
+$NetBSD: distinfo,v 1.3 2013/01/05 12:17:16 obache Exp $
-SHA1 (gmtk-1.0.6.tar.gz) = cbf3a8620327cd06f325e05b68c7d7858c070455
-RMD160 (gmtk-1.0.6.tar.gz) = 683c1e662fe8ccc49f731bb936b69aa92d30e4f2
-Size (gmtk-1.0.6.tar.gz) = 394303 bytes
+SHA1 (gmtk-1.0.7.tar.gz) = 6bebe7bb5d247472eb6f4d7b0a34ad3b94b29dc2
+RMD160 (gmtk-1.0.7.tar.gz) = eebfc01875b6b89331e2ef889c378ff6672e9b80
+Size (gmtk-1.0.7.tar.gz) = 405357 bytes
+SHA1 (patch-src_Makefile.am) = 2484c730e3fe06c6826aa65128f95e3b2207b7af
+SHA1 (patch-src_Makefile.in) = aed5db1941d3e2fbed0d5545a8cc7b761d47f72c
diff --git a/devel/gmtk/patches/patch-src_Makefile.am b/devel/gmtk/patches/patch-src_Makefile.am
new file mode 100644
index 00000000000..9d2c45255ce
--- /dev/null
+++ b/devel/gmtk/patches/patch-src_Makefile.am
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_Makefile.am,v 1.1 2013/01/05 12:17:16 obache Exp $
+
+* Address parallel build problem
+ http://code.google.com/p/gmtk/source/detail?r=192
+
+--- src/Makefile.am.orig 2012-09-22 12:49:54.000000000 +0000
++++ src/Makefile.am
+@@ -38,7 +38,7 @@ libgmtk_la_LDFLAGS = -L.libs \
+ $(AM_LDFLAGS)
+
+ libgmtk_la_LIBADD = \
+- -lgmlib \
++ libgmlib.la \
+ $(GTK_LIBS) \
+ $(ALSA_LIBS) \
+ $(PULSE_LIBS)
diff --git a/devel/gmtk/patches/patch-src_Makefile.in b/devel/gmtk/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..122f5e1fabf
--- /dev/null
+++ b/devel/gmtk/patches/patch-src_Makefile.in
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2013/01/05 12:17:16 obache Exp $
+
+* Address parallel build problem
+ http://code.google.com/p/gmtk/source/detail?r=192
+
+--- src/Makefile.in.orig 2012-10-29 18:47:14.000000000 +0000
++++ src/Makefile.in
+@@ -113,8 +113,8 @@ am__v_lt_0 = --silent
+ libgmlib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgmlib_la_CFLAGS) \
+ $(CFLAGS) $(libgmlib_la_LDFLAGS) $(LDFLAGS) -o $@
+-libgmtk_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
++libgmtk_la_DEPENDENCIES = libgmlib.la $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_libgmtk_la_OBJECTS = libgmtk_la-gmtk_common.lo \
+ libgmtk_la-gmtk_audio_meter.lo libgmtk_la-gmtk_media_player.lo \
+ libgmtk_la-gmtk_media_tracker.lo \
+@@ -398,7 +398,7 @@ libgmtk_la_LDFLAGS = -L.libs \
+ $(AM_LDFLAGS)
+
+ libgmtk_la_LIBADD = \
+- -lgmlib \
++ libgmlib.la \
+ $(GTK_LIBS) \
+ $(ALSA_LIBS) \
+ $(PULSE_LIBS)