Skip to content

Instantly share code, notes, and snippets.

@matthiasr
Created December 29, 2011 23:47
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save matthiasr/1536749 to your computer and use it in GitHub Desktop.
Save matthiasr/1536749 to your computer and use it in GitHub Desktop.
pkgsrc patch for esound not checking for libm
commit 65636f7504715a3ca832cbb72a73180fa0ac74e8
Author: Matthias Rampke <matthias@rampke.de>
Date: Thu Dec 29 17:06:19 2011 +0100
audio/esound: add configure check for libm
couldn't manage to patch configure directly, so had to take an
autoreconf detour.
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 18e41a8..13ecffc 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -21,6 +21,11 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ENV+= ac_cv_prog_JW=false
+USE_TOOLS+= automake autoreconf
+
+pre-configure:
+ cd ${WRKSRC} && autoreconf -i
+
EGDIR= ${PREFIX}/share/examples/esound
CONF_FILES= ${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index 5daf6e6..9ff1597 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -3,6 +3,7 @@ $NetBSD: distinfo,v 1.31 2011/09/09 15:20:59 wiz Exp $
SHA1 (esound-0.2.41.tar.bz2) = 6c343483b3789f439277935eaad7e478bee685ea
RMD160 (esound-0.2.41.tar.bz2) = 72597ea46e507008e3a43efaaf5b4b9ef62b896f
Size (esound-0.2.41.tar.bz2) = 396474 bytes
-SHA1 (patch-aa) = fa6d1bf07ceec181c01d57afe69a978d0a8ec401
+SHA1 (patch-Makefile.am) = 6c5c404af7e7e748b3f3907be2fb6dba6959fe13
SHA1 (patch-ab) = 907078a1b00e26f131aa149bd89490fddfd405c6
SHA1 (patch-ac) = e1e75d036c66221307ab1e9100a5c10a56f4145f
+SHA1 (patch-configure.ac) = ca4257fd9d9e6515dc29f5b2ce7c2cf79022e6dd
diff --git a/audio/esound/patches/patch-Makefile.am b/audio/esound/patches/patch-Makefile.am
new file mode 100644
index 0000000..f8225b9
--- /dev/null
+++ b/audio/esound/patches/patch-Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Makefile.am.orig 2008-11-18 17:33:39.000000000 +0000
++++ Makefile.am
+@@ -130,7 +130,7 @@ esd_LDADD = $(WRAP_LIB) $(LDADD)
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = esd.m4
+
+-esdconfdir = $(sysconfdir)
++esdconfdir = $(datadir)/examples/@PACKAGE@
+ esdconf_DATA = esd.conf
+
+ $(PACKAGE)-$(VERSION).tar.gz: dist
diff --git a/audio/esound/patches/patch-aa b/audio/esound/patches/patch-aa
deleted file mode 100644
index e38d037..0000000
--- a/audio/esound/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2011/09/09 15:20:59 wiz Exp $
-
-Install configuration into examples directory, and use
-CONF_FILES for installation.
-
---- Makefile.in.orig 2005-06-07 03:04:14.000000000 +0200
-+++ Makefile.in
-@@ -425,7 +425,7 @@ LDADD = libesd.la $(AUDIOFILE_LIBS)
- esd_LDADD = $(WRAP_LIB) $(LDADD)
- m4datadir = $(datadir)/aclocal
- m4data_DATA = esd.m4
--esdconfdir = $(sysconfdir)
-+esdconfdir = $(datadir)/examples/@PACKAGE@
- esdconf_DATA = esd.conf
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = esound.pc
diff --git a/audio/esound/patches/patch-configure.ac b/audio/esound/patches/patch-configure.ac
new file mode 100644
index 0000000..0e08729
--- /dev/null
+++ b/audio/esound/patches/patch-configure.ac
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- configure.ac.orig 2008-11-18 20:35:33.000000000 +0000
++++ configure.ac
+@@ -55,6 +55,7 @@ AC_CHECK_FUNC(nanosleep,,[
+ AC_CHECK_LIB(rt,nanosleep,,[AC_CHECK_LIB(posix4,nanosleep)])])
+ AC_CHECK_FUNCS(usleep)
+ AC_CHECK_FUNCS(strtok_r)
++AC_CHECK_LIB(m,sin)
+
+ use_inet_pton=no
+ AC_CHECK_FUNC(inet_pton,use_inet_pton=yes,[AC_CHECK_LIB(resolv,inet_pton)])
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment