Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
sambuc
2014-11-05 12:41:07 +01:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files
audio/libcanberra/Makefile
+4 -10
View File
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.31 2013/06/06 12:53:54 wiz Exp $
# $NetBSD: Makefile,v 1.35 2013/10/10 14:41:53 ryoon Exp $
DISTNAME= libcanberra-0.26
PKGREVISION= 14
DISTNAME= libcanberra-0.27
PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/
@@ -15,14 +15,9 @@ USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake
PKGCONFIG_OVERRIDE+= libcanberra-gtk.pc.in
PKGCONFIG_OVERRIDE+= libcanberra-gtk3.pc.in
PKGCONFIG_OVERRIDE+= libcanberra.pc.in
SUBST_CLASSES+= ltdlc
SUBST_SED.ltdlc= -e "s,ltdlc,ltdl,"
SUBST_FILES.ltdlc= configure
SUBST_MESSAGE.ltdlc= Fixing libtool convenience library name.
SUBST_STAGE.ltdlc= pre-configure
REPLACE_SH= src/libcanberra-logout-sound.sh.in
CONFIGURE_ENV+= ac_cv_lib_ltdl_lt_dladvise_init=yes
@@ -31,7 +26,6 @@ PLIST_VARS+= oss
.include "options.mk"
#.include "../../devel/libltdl/convenience.mk"
.include "../../devel/libltdl/buildlink3.mk"
.include "../../devel/GConf/schemas.mk"
.include "../../mk/oss.buildlink3.mk"
audio/libcanberra/PLIST
+7 -3
View File
@@ -1,15 +1,19 @@
@comment $NetBSD: PLIST,v 1.7 2011/05/12 13:39:09 adam Exp $
${PLIST.gtk}bin/canberra-gtk-play
${PLIST.gtk}include/canberra-gtk.h
@comment $NetBSD: PLIST,v 1.8 2013/08/12 07:09:59 obache Exp $
${PLIST.gtk-any}bin/canberra-gtk-play
${PLIST.gtk-any}include/canberra-gtk.h
include/canberra.h
${PLIST.gtk}lib/gtk-2.0/modules/libcanberra-gtk-module.la
${PLIST.gtk3}lib/gtk-3.0/modules/libcanberra-gtk-module.so
${PLIST.gtk3}lib/gtk-3.0/modules/libcanberra-gtk3-module.la
lib/${PKGNAME}/libcanberra-gstreamer.la
lib/${PKGNAME}/libcanberra-multi.la
lib/${PKGNAME}/libcanberra-null.la
${PLIST.oss}lib/${PKGNAME}/libcanberra-oss.la
${PLIST.gtk}lib/libcanberra-gtk.la
${PLIST.gtk3}lib/libcanberra-gtk3.la
lib/libcanberra.la
${PLIST.gtk}lib/pkgconfig/libcanberra-gtk.pc
${PLIST.gtk3}lib/pkgconfig/libcanberra-gtk3.pc
lib/pkgconfig/libcanberra.pc
share/doc/libcanberra/README
${PLIST.gtk}share/gconf/schemas/libcanberra.schemas
audio/libcanberra/buildlink3.mk
+10 -3
View File
@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.21 2013/06/06 12:53:54 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.24 2013/10/10 14:41:53 ryoon Exp $
BUILDLINK_TREE+= libcanberra
@@ -6,11 +6,18 @@ BUILDLINK_TREE+= libcanberra
LIBCANBERRA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libcanberra+= libcanberra>=0.10
BUILDLINK_ABI_DEPENDS.libcanberra+= libcanberra>=0.26nb14
BUILDLINK_ABI_DEPENDS.libcanberra+= libcanberra>=0.27nb3
BUILDLINK_PKGSRCDIR.libcanberra?= ../../audio/libcanberra
#.include "../../multimedia/gstreamer0.10/buildlink3.mk"
pkgbase := libcanberra
.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.libcanberra:Mgtk)
.include "../../x11/gtk2/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.libcanberra:Mgtk3)
.include "../../x11/gtk3/buildlink3.mk"
.endif
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
.endif # LIBCANBERRA_BUILDLINK3_MK
audio/libcanberra/distinfo
+7 -6
View File
@@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.4 2010/11/28 21:12:54 adam Exp $
$NetBSD: distinfo,v 1.6 2013/08/15 09:45:58 richard Exp $
SHA1 (libcanberra-0.26.tar.gz) = 31a1cb8757e5da39b4cdc06e523d011578d7a3e3
RMD160 (libcanberra-0.26.tar.gz) = f58fc2cfa4b35f6a6b2577057b969977f7de3b5d
Size (libcanberra-0.26.tar.gz) = 463209 bytes
SHA1 (patch-aa) = 9507099aed0a4609a31274fed219a6ab8e930e24
SHA1 (patch-ab) = 9c9d6222354a60e39db61cf18f97fd95f1396f88
SHA1 (libcanberra-0.27.tar.gz) = b2dc2b23109f32a11217b71f87c044f1ef9b7977
RMD160 (libcanberra-0.27.tar.gz) = 1003bedf3fd6025ad046645f9a88af3d8653a0e5
Size (libcanberra-0.27.tar.gz) = 490442 bytes
SHA1 (patch-aa) = abef0e544f8d9789e971511c9b363b33dd2391ca
SHA1 (patch-ab) = 2a5767e0aa29f5dc4f6b6fd15a0f2aaf1f5dd329
SHA1 (patch-config.h.in) = 26c549594db30b525cab345bb19c9455f52098d2
audio/libcanberra/options.mk
+14 -5
View File
@@ -1,15 +1,24 @@
# $NetBSD: options.mk,v 1.1 2011/05/12 13:39:24 adam Exp $
# $NetBSD: options.mk,v 1.2 2013/08/12 07:09:59 obache Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libcanberra
PKG_SUPPORTED_OPTIONS= gtk
PKG_SUGGESTED_OPTIONS= gtk
PKG_SUPPORTED_OPTIONS= gtk gtk3
PKG_SUGGESTED_OPTIONS= gtk gtk3
.include "../../mk/bsd.options.mk"
PLIST_VARS+= gtk
PLIST_VARS+= gtk-any gtk gtk3
.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgtk3)
GCONF_SCHEMAS+= libcanberra.schemas
PLIST.gtk-any= yes
.endif
.if !empty(PKG_OPTIONS:Mgtk)
GCONF_SCHEMAS+= libcanberra.schemas
PLIST.gtk= yes
.include "../../x11/gtk2/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mgtk3)
PLIST.gtk3= yes
.include "../../x11/gtk3/buildlink3.mk"
.endif
audio/libcanberra/patches/patch-aa
+38 -4
View File
@@ -1,13 +1,47 @@
$NetBSD: patch-aa,v 1.2 2010/11/28 21:12:54 adam Exp $
$NetBSD: patch-aa,v 1.4 2013/08/15 09:45:58 richard Exp $
--- src/oss.c.orig 2010-02-19 23:39:40.000000000 +0000
* configure OSS device name
* use config.h WORDS_BIGENDIAN macro
--- src/oss.c.orig 2011-02-09 21:02:40.000000000 +0000
+++ src/oss.c
@@ -243,7 +243,7 @@ static int open_oss(ca_context *c, struc
@@ -21,10 +21,6 @@
<http://www.gnu.org/licenses/>.
***/
p = PRIVATE(c);
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/param.h>
@@ -38,6 +34,10 @@
#include <pthread.h>
#include <semaphore.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef HAVE_MACHINE_SOUNDCARD_H
# include <machine/soundcard.h>
#else
@@ -240,7 +240,7 @@ static int open_oss(ca_context *c, struc
* multichannel streams. We cannot support those files hence */
ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) <= 2, CA_ERROR_NOTSUPPORTED);
- if ((out->pcm = open(c->device ? c->device : "/dev/dsp", O_WRONLY | O_NONBLOCK, 0)) < 0)
+ if ((out->pcm = open(c->device ? c->device : DEVOSSAUDIO, O_WRONLY | O_NONBLOCK, 0)) < 0)
goto finish_errno;
if ((mode = fcntl(out->pcm, F_GETFL)) < 0)
@@ -259,7 +259,7 @@ static int open_oss(ca_context *c, struc
val = AFMT_S16_NE;
break;
case CA_SAMPLE_S16RE:
-#if __BYTE_ORDER == __LITTLE_ENDIAN
+#ifndef WORDS_BIGENDIAN
val = AFMT_S16_BE;
#else
val = AFMT_S16_LE;
audio/libcanberra/patches/patch-ab
+5 -3
View File
@@ -1,8 +1,10 @@
$NetBSD: patch-ab,v 1.2 2010/11/28 21:12:54 adam Exp $
$NetBSD: patch-ab,v 1.3 2013/08/12 07:09:59 obache Exp $
--- src/Makefile.in.orig 2010-10-04 17:52:31.000000000 +0000
* configure OSS device and library name
--- src/Makefile.in.orig 2011-02-18 00:14:23.000000000 +0000
+++ src/Makefile.in
@@ -692,10 +692,10 @@ plugin_LTLIBRARIES = $(am__append_7) $(a
@@ -732,10 +732,10 @@ plugin_LTLIBRARIES = $(am__append_7) $(a
@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_change_props=oss_driver_change_props \
@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_play=oss_driver_play \
@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_cancel=oss_driver_cancel \
audio/libcanberra/patches/patch-config.h.in
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-config.h.in,v 1.1 2013/08/15 09:45:58 richard Exp $
* better support for solaris which defines _BIG_ENDIAN
--- config.h.in.orig 2011-02-18 00:26:31.000000000 +0000
+++ config.h.in
@@ -210,7 +210,7 @@
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
+# if defined(__BIG_ENDIAN__) || defined(_BIG_ENDIAN)
# define WORDS_BIGENDIAN 1
# endif
#else