ports/82135: [maintainer-update] audio/ocp 0.1.7 -> 0.1.9
Emanuel Haupt
ehaupt at critical.ch
Sat Jun 11 06:00:43 UTC 2005
>Number: 82135
>Category: ports
>Synopsis: [maintainer-update] audio/ocp 0.1.7 -> 0.1.9
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 11 06:00:39 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Emanuel Haupt
>Release: FreeBSD 5.4-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD beaver.critical.ch 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #1: Fri May 13 17:48:58 CEST 2005 root at beaver.critical.ch:/usr/obj/usr/src-release/src/sys/BEAVER i386
>Description:
The follwing patch updates audio/ocp from version 0.1.7 to 0.1.9.
The new version supports libadplug (audio/libadplug) file formats which can
be turned on with the WITH_ADPLUG knob. Currently WITH_ADPLUG breaks X11 support,
that is why WITH_ADPLUG is disabled per default.
Suggestion for ${PORTSDIR}/UPDATING
%Y%m%d:
AFFECTS: audio/ocp
AUTHOR: ehaupt at critical.ch
ocp 0.1.9 has now support for libadplug. If you are using ocp under 4.x,
audio/libadplug and devel/libbinio needs to be built with GCC 3.4+
If you have already installed devel/libbinio prior to version 1.3_1 or
audio/libadplug prior to version 1.5.1_1 please do the following steps:
- cvsup your ports tree
# portupgrade libadplug libbinio
>How-To-Repeat:
>Fix:
--- ocp.patch begins here ---
diff -Nur ocp.orig/Makefile ocp/Makefile
--- ocp.orig/Makefile Wed May 4 18:22:23 2005
+++ ocp/Makefile Sat Jun 11 07:32:08 2005
@@ -6,7 +6,7 @@
#
PORTNAME= ocp
-PORTVERSION= 0.1.7
+PORTVERSION= 0.1.9
CATEGORIES= audio
MASTER_SITES= http://labs.nixia.no/
@@ -27,13 +27,18 @@
CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
+CFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
+CXXFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \
CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS= --with-dir-suffix=""
+CONFIGURE_ARGS= --with-dir-suffix="" \
+ --libdir=${LOCALBASE}/lib \
+ ${CONFIGURE_TARGET}
TIMIDITY_CFG= ${LOCALBASE}/share/timidity/timidity.cfg
@@ -52,6 +57,13 @@
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --with-debug
.endif
+.if defined(WITH_ADPLUG)
+LIB_DEPENDS+= adplug-1.5.1:${PORTSDIR}/audio/libadplug
+CONFIGURE_ARGS+= --without-x11
+PLIST_FILES+= lib/ocp/opltype.so lib/ocp/playopl.so
+.else
+CONFIGURE_ARGS+= --without-adplug
+.endif
pre-everything::
.if !exists(${TIMIDITY_CFG}) && !defined(WITHOUT_MIDI)
@@ -60,25 +72,27 @@
@${ECHO_MSG} "Define WITHOUT_MIDI if you do not want to install it."
@${ECHO_MSG} ""
.endif
-.if !defined(WITHOUT_X11)
+.if !defined(WITHOUT_X11) && !defined(WITH_ADPLUG)
@${ECHO_MSG} ""
@${ECHO_MSG} "If you want to compile without X11 support, hit Ctrl-C right now and"
@${ECHO_MSG} "define WITHOUT_X11"
@${ECHO_MSG} ""
.endif
+# Hangs on exit
+.if defined(WITH_ADPLUG) && !defined(WITHOUT_X11)
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "Disabling X11 support. X11 and libadplug usage cannot yet peacefully
+ @${ECHO_MSG} "coexist."
+ @${ECHO_MSG} ""
+.endif
+
post-patch:
.if defined(WITH_DEBUG)
- @${REINPLACE_CMD} -e 's|/\*\ \(#define\ .*DEBUG\ 1\)\ \*/|\1|' \
+ @${REINPLACE_CMD} -e 's|/\*\ \(#define\ LD_DEBUG\ 1\)\ \*/|\1|' \
${WRKSRC}/config.h.in
.endif
- @${REINPLACE_CMD} -e 's|@LIBDIR@|${PREFIX}/lib/ocp|' \
- ${WRKSRC}/Rules.make.in
@${REINPLACE_CMD} -e 's|stdint\.h|inttypes\.h|' ${WRKSRC}/types.h
- @${REINPLACE_CMD} -e 's|\(-shared\)|-L${LOCALBASE}/lib -L${X11BASE}/lib \1|' \
- ${WRKSRC}/playmp2/Makefile \
- ${WRKSRC}/playogg/Makefile \
- ${WRKSRC}/playsid/Makefile
@${REINPLACE_CMD} -e 's|/etc/.*\.cfg|${TIMIDITY_CFG}|' \
${WRKSRC}/playgmi/gmitimidity.c
diff -Nur ocp.orig/distinfo ocp/distinfo
--- ocp.orig/distinfo Wed May 4 18:22:23 2005
+++ ocp/distinfo Sat Jun 11 06:54:29 2005
@@ -1,2 +1,2 @@
-MD5 (ocp-0.1.7.tar.gz) = b04d6cc95f28d2b7fca9caf4b580129b
-SIZE (ocp-0.1.7.tar.gz) = 614935
+MD5 (ocp-0.1.9.tar.gz) = 033b17bd7fbbffb55298b9199919d3de
+SIZE (ocp-0.1.9.tar.gz) = 588351
diff -Nur ocp.orig/files/patch-playmp2_Makefile ocp/files/patch-playmp2_Makefile
--- ocp.orig/files/patch-playmp2_Makefile Sun Apr 24 16:11:31 2005
+++ ocp/files/patch-playmp2_Makefile Thu Jan 1 01:00:00 1970
@@ -1,17 +0,0 @@
---- playmp2/Makefile.orig Sat Apr 23 22:20:07 2005
-+++ playmp2/Makefile Sat Apr 23 22:20:39 2005
-@@ -13,7 +13,7 @@
- ../filesel/mdb.h
- $(CC) mpptype.c -o $@ -c
-
--playmp2_so=mppplay.o mpplay.o
-+playmp2_so=mppplay.o mpplay.o memmem.o
- playmp2.so: $(playmp2_so)
- $(CC) -shared -o $@ $^ -lmad -lid3tag -lz
-
-@@ -45,3 +45,5 @@
- mpplay.h
- $(CC) mpplay.c -o $@ -c
-
-+memmem.o: memmem.c
-+ $(CC) memmem.c -o $@ -c
diff -Nur ocp.orig/files/patch-playmp2_memmem.c ocp/files/patch-playmp2_memmem.c
--- ocp.orig/files/patch-playmp2_memmem.c Sun Apr 24 16:11:31 2005
+++ ocp/files/patch-playmp2_memmem.c Thu Jan 1 01:00:00 1970
@@ -1,62 +0,0 @@
---- playmp2/memmem.c.orig Sat Apr 23 22:19:21 2005
-+++ playmp2/memmem.c Sat Apr 23 22:19:15 2005
-@@ -0,0 +1,59 @@
-+/* Copyright (C) 1991,92,93,94,96,97,98,2000 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#include <stddef.h>
-+#include <string.h>
-+
-+/* Prepare for the case that `__builtin_expect' is not available. */
-+#ifndef HAVE_BUILTIN_EXPECT
-+# define __builtin_expect(expr, val) (expr)
-+#endif
-+
-+#undef memmem
-+
-+/* Return the first occurrence of NEEDLE in HAYSTACK. */
-+void *
-+memmem (haystack, haystack_len, needle, needle_len)
-+ const void *haystack;
-+ size_t haystack_len;
-+ const void *needle;
-+ size_t needle_len;
-+{
-+ const char *begin;
-+ const char *const last_possible
-+ = (const char *) haystack + haystack_len - needle_len;
-+
-+ if (needle_len == 0)
-+ /* The first occurrence of the empty string is deemed to occur at
-+ the beginning of the string. */
-+ return (void *) haystack;
-+
-+ /* Sanity check, otherwise the loop might search through the whole
-+ memory. */
-+ if (__builtin_expect (haystack_len < needle_len, 0))
-+ return NULL;
-+
-+ for (begin = (const char *) haystack; begin <= last_possible; ++begin)
-+ if (begin[0] == ((const char *) needle)[0] &&
-+ !memcmp ((const void *) &begin[1],
-+ (const void *) ((const char *) needle + 1),
-+ needle_len - 1))
-+ return (void *) begin;
-+
-+ return NULL;
-+}
diff -Nur ocp.orig/pkg-plist ocp/pkg-plist
--- ocp.orig/pkg-plist Mon May 2 11:36:28 2005
+++ ocp/pkg-plist Sat Jun 11 06:33:18 2005
@@ -41,6 +41,7 @@
lib/ocp/playmp2.so
lib/ocp/playogg.so
lib/ocp/playsid.so
+lib/ocp/sidtype.so
lib/ocp/playwav.so
lib/ocp/playxm.so
lib/ocp/plrbase.so
--- ocp.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list