CVS commit: pkgsrc/audio/grip

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio/grip
From: Frédéric Fauberteau <triaxx%netbsd.org@localhost>
Date: Fri, 18 Aug 2017 12:21:29 +0000

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Aug 18 12:21:29 UTC 2017

Added Files:
        pkgsrc/audio/grip: DESCR Makefile PLIST distinfo options.mk
        pkgsrc/audio/grip/patches: patch-configure patch-src_cdpar.h
            patch-src_cdplay.c patch-src_grip.c patch-src_grip.h

Log Message:
Add audio/grip package version 3.5.2

Grip is a GTK-based CD-player and CD-ripper / MP3 encoder. It has the ripping
capabilities of cdparanoia built in, but can also use external rippers (such as
cdda2wav). Encoder presets are provided for lame, bladeenc, l3enc, xingmp3enc,
mp3encode, gogo)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/grip/DESCR pkgsrc/audio/grip/Makefile \
    pkgsrc/audio/grip/PLIST pkgsrc/audio/grip/distinfo \
    pkgsrc/audio/grip/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/grip/patches/patch-configure \
    pkgsrc/audio/grip/patches/patch-src_cdpar.h \
    pkgsrc/audio/grip/patches/patch-src_cdplay.c \
    pkgsrc/audio/grip/patches/patch-src_grip.c \
    pkgsrc/audio/grip/patches/patch-src_grip.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/audio/grip/DESCR
diff -u /dev/null pkgsrc/audio/grip/DESCR:1.1
--- /dev/null   Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/DESCR     Fri Aug 18 12:21:29 2017
@@ -0,0 +1,4 @@
+Grip is a GTK-based CD-player and CD-ripper / MP3 encoder. It has the ripping
+capabilities of cdparanoia built in, but can also use external rippers (such as
+cdda2wav). Encoder presets are provided for lame, bladeenc, l3enc, xingmp3enc,
+mp3encode, gogo)
Index: pkgsrc/audio/grip/Makefile
diff -u /dev/null pkgsrc/audio/grip/Makefile:1.1
--- /dev/null   Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/Makefile  Fri Aug 18 12:21:29 2017
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2017/08/18 12:21:29 triaxx Exp $
+
+DISTNAME=      grip-3.5.2
+CATEGORIES=    audio
+MASTER_SITES=  https://downloads.sourceforge.net/project/grip/3.5.2/
+
+MAINTAINER=    triaxx%NetBSD.org@localhost
+HOMEPAGE=      https://sourceforge.net/project/grip/
+COMMENT=       CD-player and CD-ripper for the Gnome desktop
+LICENSE=       gnu-gpl-v2
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL=   yes
+USE_LANGUAGES= c c++
+USE_TOOLS+=    pkg-config
+
+.include "../../audio/grip/options.mk"
+
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/vte/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/grip/PLIST
diff -u /dev/null pkgsrc/audio/grip/PLIST:1.1
--- /dev/null   Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/PLIST     Fri Aug 18 12:21:29 2017
@@ -0,0 +1,85 @@
+@comment $NetBSD: PLIST,v 1.1 2017/08/18 12:21:29 triaxx Exp $
+bin/grip
+man/man1/grip.1
+share/applications/grip.desktop
+share/apps/solid/actions/grip-audiocd.desktop
+share/gnome/help/grip/C/cdconfig.png
+share/gnome/help/grip/C/cdplayer.png
+share/gnome/help/grip/C/cdplayersmall.png
+share/gnome/help/grip/C/cdscan.png
+share/gnome/help/grip/C/discdb.png
+share/gnome/help/grip/C/discdbconfig.png
+share/gnome/help/grip/C/editing.png
+share/gnome/help/grip/C/eject.png
+share/gnome/help/grip/C/encprog.png
+share/gnome/help/grip/C/ffwd.png
+share/gnome/help/grip/C/grip-logo.png
+share/gnome/help/grip/C/grip.xml
+share/gnome/help/grip/C/id3config.png
+share/gnome/help/grip/C/minmax.png
+share/gnome/help/grip/C/miscconfig.png
+share/gnome/help/grip/C/modeinterface.png
+share/gnome/help/grip/C/mp3config.png
+share/gnome/help/grip/C/mp3config2.png
+share/gnome/help/grip/C/multiartist.png
+share/gnome/help/grip/C/nexttrk.png
+share/gnome/help/grip/C/playloop.png
+share/gnome/help/grip/C/playnormal.png
+share/gnome/help/grip/C/playonce.png
+share/gnome/help/grip/C/playpause.png
+share/gnome/help/grip/C/playplaylist.png
+share/gnome/help/grip/C/playrandom.png
+share/gnome/help/grip/C/prevtrk.png
+share/gnome/help/grip/C/progtrack.png
+share/gnome/help/grip/C/proxyconfig.png
+share/gnome/help/grip/C/quit.png
+share/gnome/help/grip/C/rewind.png
+share/gnome/help/grip/C/ripconfig.png
+share/gnome/help/grip/C/ripconfig2.png
+share/gnome/help/grip/C/ripconfig3.png
+share/gnome/help/grip/C/ripping.png
+share/gnome/help/grip/C/ripprog.png
+share/gnome/help/grip/C/ripsmall.png
+share/gnome/help/grip/C/smile1.png
+share/gnome/help/grip/C/smile2.png
+share/gnome/help/grip/C/smile3.png
+share/gnome/help/grip/C/smile4.png
+share/gnome/help/grip/C/smile5.png
+share/gnome/help/grip/C/smile6.png
+share/gnome/help/grip/C/smile7.png
+share/gnome/help/grip/C/smile8.png
+share/gnome/help/grip/C/stop.png
+share/gnome/help/grip/C/trkedit.png
+share/gnome/help/grip/C/volume.png
+share/icons/hicolor/16x16/apps/grip.png
+share/icons/hicolor/22x22/apps/grip.png
+share/icons/hicolor/24x24/apps/grip.png
+share/icons/hicolor/32x32/apps/grip.png
+share/icons/hicolor/48x48/apps/grip.png
+share/icons/hicolor/64x64/apps/grip.png
+share/icons/hicolor/72x72/apps/grip.png
+share/icons/hicolor/scalable/apps/grip.svg
+share/locale/be/LC_MESSAGES/grip.mo
+share/locale/bg/LC_MESSAGES/grip.mo
+share/locale/ca/LC_MESSAGES/grip.mo
+share/locale/de/LC_MESSAGES/grip.mo
+share/locale/es/LC_MESSAGES/grip.mo
+share/locale/fi/LC_MESSAGES/grip.mo
+share/locale/fr/LC_MESSAGES/grip.mo
+share/locale/fur/LC_MESSAGES/grip.mo
+share/locale/hu/LC_MESSAGES/grip.mo
+share/locale/it/LC_MESSAGES/grip.mo
+share/locale/ja/LC_MESSAGES/grip.mo
+share/locale/nb/LC_MESSAGES/grip.mo
+share/locale/nl/LC_MESSAGES/grip.mo
+share/locale/pl/LC_MESSAGES/grip.mo
+share/locale/pt_BR/LC_MESSAGES/grip.mo
+share/locale/ru/LC_MESSAGES/grip.mo
+share/locale/sr/LC_MESSAGES/grip.mo
+share/locale/uk/LC_MESSAGES/grip.mo
+share/locale/vi/LC_MESSAGES/grip.mo
+share/locale/zh_CN/LC_MESSAGES/grip.mo
+share/locale/zh_HK/LC_MESSAGES/grip.mo
+share/locale/zh_TW/LC_MESSAGES/grip.mo
+share/pixmaps/grip.png
+share/pixmaps/griptray.png
Index: pkgsrc/audio/grip/distinfo
diff -u /dev/null pkgsrc/audio/grip/distinfo:1.1
--- /dev/null   Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/distinfo  Fri Aug 18 12:21:29 2017
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1 2017/08/18 12:21:29 triaxx Exp $
+
+SHA1 (grip-3.5.2.tar.gz) = 6a9c20502a4c71decc454348457021844c6958de
+RMD160 (grip-3.5.2.tar.gz) = e95b15315f8ca1bbde0d3a66d8f30394aa04b7f3
+SHA512 (grip-3.5.2.tar.gz) = 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421
+Size (grip-3.5.2.tar.gz) = 952153 bytes
+SHA1 (patch-configure) = ada978fd8a4261a225f1728a050c7e7193331ce8
+SHA1 (patch-src_cdpar.h) = d23ad69260de44da8d10e9b4e9b83d220e4dc0ef
+SHA1 (patch-src_cdplay.c) = ae6dd708d4a5bc61ad49477e79b2005959290634
+SHA1 (patch-src_grip.c) = ed6ff6e70d0395af4a1ca3b06337a7fb354a0fae
+SHA1 (patch-src_grip.h) = 3e7ed2dbee435b3ee975e2e4bd0d5530cdd9ec92
Index: pkgsrc/audio/grip/options.mk
diff -u /dev/null pkgsrc/audio/grip/options.mk:1.1
--- /dev/null   Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/options.mk        Fri Aug 18 12:21:29 2017
@@ -0,0 +1,27 @@
+# $NetBSD: options.mk,v 1.1 2017/08/18 12:21:29 triaxx Exp $
+#
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.grip
+PKG_SUPPORTED_OPTIONS=         cdparanoia id3
+PKG_SUGGESTED_OPTIONS=         cdparanoia id3
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+###
+### Cdparanoia support
+###
+.if !empty(PKG_OPTIONS:Mcdparanoia)
+.  include "../../audio/cdparanoia/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-cdpar
+.endif
+
+###
+### ID3v2 support
+###
+.if !empty(PKG_OPTIONS:Mid3)
+.  include "../../audio/id3lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-id3
+.endif

Index: pkgsrc/audio/grip/patches/patch-configure
diff -u /dev/null pkgsrc/audio/grip/patches/patch-configure:1.1
--- /dev/null   Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/patches/patch-configure   Fri Aug 18 12:21:29 2017
@@ -0,0 +1,37 @@
+$NetBSD: patch-configure,v 1.1 2017/08/18 12:21:29 triaxx Exp $
+
+Add a test to find cdparanoia include directory.
+
+XXX: this patch could be useless if the cdparanoia package provided by pkgsrc
+did not override the default include directory.
+
+--- configure.orig     2017-07-31 21:24:47.000000000 +0000
++++ configure
+@@ -16529,6 +16529,27 @@ fi
+ done
+ 
+ 
++  for ac_header in cdparanoia/cdda_interface.h cdparanoia/cdda_paranoia.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_CDPARANOIA_CDDA_INTERFACE_H
++    # include <cdparanoia/cdda_interface.h>
++    #endif
++    #ifdef HAVE_CDPARANOIA_CDDA_PARANOIA_H
++    # include <cdparanoia/cdda_paranoia.h>
++    #endif
++
++"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcdda_interface" >&5
+ $as_echo_n "checking for main in -lcdda_interface... " >&6; }
+ if ${ac_cv_lib_cdda_interface_main+:} false; then :
Index: pkgsrc/audio/grip/patches/patch-src_cdpar.h
diff -u /dev/null pkgsrc/audio/grip/patches/patch-src_cdpar.h:1.1
--- /dev/null   Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/patches/patch-src_cdpar.h Fri Aug 18 12:21:29 2017
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_cdpar.h,v 1.1 2017/08/18 12:21:29 triaxx Exp $
+
+Add a test to include cdparanoia headers.
+
+XXX: this patch could be useless if the cdparanoia package provided by pkgsrc
+did not override the default include directory.
+
+--- src/cdpar.h.orig   2016-12-30 19:56:07.000000000 +0000
++++ src/cdpar.h
+@@ -26,7 +26,10 @@
+ #ifdef HAVE_CDDA_INTERFACE_H
+ #include <cdda_interface.h>
+ #include <cdda_paranoia.h>
+-#else
++#elif HAVE_CDDA_CDDA_INTERFACE_H
+ #include <cdda/cdda_interface.h>
+ #include <cdda/cdda_paranoia.h>
++#else
++#include <cdparanoia/cdda_interface.h>
++#include <cdparanoia/cdda_paranoia.h>
+ #endif
Index: pkgsrc/audio/grip/patches/patch-src_cdplay.c
diff -u /dev/null pkgsrc/audio/grip/patches/patch-src_cdplay.c:1.1
--- /dev/null   Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/patches/patch-src_cdplay.c        Fri Aug 18 12:21:29 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_cdplay.c,v 1.1 2017/08/18 12:21:29 triaxx Exp $
+
+Add system dependent headers.
+
+--- src/cdplay.c.orig  2017-07-31 21:04:11.000000000 +0000
++++ src/cdplay.c
+@@ -20,6 +20,9 @@
+  * USA
+  */
+ 
++#if defined(__NetBSD__)
++#include <sys/wait.h>
++#endif
+ #include "cdplay.h"
+ #include "grip.h"
+ #include "config.h"
Index: pkgsrc/audio/grip/patches/patch-src_grip.c
diff -u /dev/null pkgsrc/audio/grip/patches/patch-src_grip.c:1.1
--- /dev/null   Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/patches/patch-src_grip.c  Fri Aug 18 12:21:29 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_grip.c,v 1.1 2017/08/18 12:21:29 triaxx Exp $
+
+Add system dependent headers.
+
+--- src/grip.c.orig    2017-07-31 21:04:12.000000000 +0000
++++ src/grip.c
+@@ -26,6 +26,9 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/param.h>
++#if defined(__NetBSD__)
++#include <sys/wait.h>
++#endif
+ #include <gdk/gdkx.h>
+ #include <X11/Xlib.h>
+ #include <time.h>
Index: pkgsrc/audio/grip/patches/patch-src_grip.h
diff -u /dev/null pkgsrc/audio/grip/patches/patch-src_grip.h:1.1
--- /dev/null   Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/patches/patch-src_grip.h  Fri Aug 18 12:21:29 2017
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_grip.h,v 1.1 2017/08/18 12:21:29 triaxx Exp $
+
+Add a test on the macro needed by pkgsrc cdparanoia.
+
+XXX: this patch could be useless if the cdparanoia package provided by pkgsrc
+did not override the default include directory.
+
+--- src/grip.h.orig    2017-06-03 21:05:41.000000000 +0000
++++ src/grip.h
+@@ -33,7 +33,7 @@
+ #include "status_window.h"
+ #include "eggtrayicon.h"
+ 
+-#if defined(HAVE_CDDA_INTERFACE_H) || defined(HAVE_CDDA_CDDA_INTERFACE_H)
++#if defined(HAVE_CDDA_INTERFACE_H) || defined(HAVE_CDDA_CDDA_INTERFACE_H) || defined(HAVE_CDPARANOIA_CDDA_INTERFACE_H)
+ #define CDPAR
+ #endif
+

Follow-Ups:
- Re: CVS commit: pkgsrc/audio/grip
  - From: maya

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: Re: CVS commit: pkgsrc/audio/grip
Indexes:

Home | Main Index | Thread Index | Old Index