cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to FLAC 1.0.4. Die, libtool, die!

Browse Source
This commit is contained in:
naddy 2002-11-03 02:14:54 +00:00
parent f5af625085
commit b30d3d81d4
5 changed files with 76 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
audio/xmms-flac/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2002/07/07 19:09:29 naddy Exp $
# $OpenBSD: Makefile,v 1.5 2002/11/03 02:14:54 naddy Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
COMMENT= "XMMS input plugin for playing FLAC files"
VERSION= 1.0.3
VERSION= 1.0.4
PKGNAME= xmms-flac-${VERSION}
DISTNAME= flac-${VERSION}
CATEGORIES= audio
@ -20,15 +20,29 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/}
LIB_DEPENDS= xmms.3::audio/xmms \
FLAC.3::audio/flac
FLAC.4::audio/flac
WRKSRC= ${WRKDIST}/src/plugin_xmms
CONFIGURE_STYLE= gnu automake
MODGNU_CONFIG_GUESS_DIRS= ${WRKDIST}
CONFIGURE_STYLE= gnu automake
CONFIGURE_ARGS= --without-id3lib
# libtool doesn't handle linking a module against a convenience library
PLUGIN_COMMON_FILES= all.h canonical_tag.c canonical_tag.h \
charset.c:charset_common.c charset.h:charset_common.h \
dither.c dither.h id3v1.c id3v1.h id3v2.c id3v2.h \
locale_hack.h vorbiscomment.c vorbiscomment.h
pre-patch:
.for file in ${PLUGIN_COMMON_FILES}
@cp ${WRKDIST}/src/plugin_common/${file:C/:.*//} \
${WRKSRC}/${file:C/.*://}
.endfor
post-patch:
cd ${WRKDIST}; automake -i
@cd ${WRKDIST}; automake -v -i src/plugin_xmms/Makefile
pre-configure:
@echo '#!/bin/sh' >${WRKSRC}/configure

6
audio/xmms-flac/distinfo
View File

@ -1,3 +1,3 @@
MD5 (flac-1.0.3.tar.gz) = 419e4e4c3403055af1cd6d4a735a9201
RMD160 (flac-1.0.3.tar.gz) = 45d3b3966a82be848d3463bc67426e5554a88a11
SHA1 (flac-1.0.3.tar.gz) = 72106148c43f938df441d227f4b6198cfcadfdb8
MD5 (flac-1.0.4.tar.gz) = b1523e6ad8ef85d1df5b18f20a8cfad6
RMD160 (flac-1.0.4.tar.gz) = e6d923e7283fa530eadfbc9f0016f9018441e147
SHA1 (flac-1.0.4.tar.gz) = d16beeb8b1f37044d59ba7f2b80a2c3c8db3e7e3

28
audio/xmms-flac/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2002/07/07 19:09:29 naddy Exp $
--- configure.orig Wed Jul 3 23:01:22 2002
+++ configure Sat Jul 6 22:26:40 2002
@@ -5372,7 +5372,7 @@ else
$OpenBSD: patch-configure,v 1.4 2002/11/03 02:14:54 naddy Exp $
--- configure.orig Wed Sep 25 06:53:08 2002
+++ configure Sun Nov 3 02:45:50 2002
@@ -5388,7 +5388,7 @@ else
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@ -10,7 +10,25 @@ $OpenBSD: patch-configure,v 1.3 2002/07/07 19:09:29 naddy Exp $
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
@@ -9995,7 +9995,7 @@ OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(s
@@ -5398,7 +5398,7 @@ else
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
@@ -9519,7 +9519,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- . conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}"
+ . ./conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}"
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
@@ -11113,7 +11113,7 @@ OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(s
if test x$debug = xtrue; then
OUR_CFLAGS_TAIL="-g -O0 -DDEBUG"
else

26
audio/xmms-flac/patches/patch-src_plugin_xmms_Makefile_am
View File

@ -1,11 +1,21 @@
$OpenBSD: patch-src_plugin_xmms_Makefile_am,v 1.1.1.1 2002/02/01 15:44:31 naddy Exp $
--- src/plugin_xmms/Makefile.am.orig Fri Jan 18 01:47:31 2002
+++ src/plugin_xmms/Makefile.am Fri Jan 18 01:47:52 2002
@@ -26,6 +26,5 @@ LIBTOOL = $(top_builddir)/libtool-disabl
$OpenBSD: patch-src_plugin_xmms_Makefile_am,v 1.2 2002/11/03 02:14:54 naddy Exp $
--- src/plugin_xmms/Makefile.am.orig Mon Sep 9 22:11:30 2002
+++ src/plugin_xmms/Makefile.am Sat Nov 2 01:46:34 2002
@@ -36,7 +36,9 @@ LIBTOOL = $(top_builddir)/libtool-disabl
xmmsinputplugin_LTLIBRARIES = libxmms-flac.la
libxmms_flac_la_SOURCES = plugin.c
-libxmms_flac_la_LIBADD = $(top_builddir)/src/libFLAC/libFLAC.la @XMMS_LIBS@
-#libxmms_flac_la_LIBADD = -L$(top_builddir)/src/libFLAC/.libs -lFLAC @XMMS_LIBS@
+libxmms_flac_la_LIBADD = -lFLAC @XMMS_LIBS@
-plugin_sources = charset.c configure.c plugin.c wrap_id3.c
+plugin_sources = charset.c configure.c plugin.c wrap_id3.c \
+ canonical_tag.c charset_common.c dither.c id3v1.c id3v2.c \
+ vorbiscomment.c
if FLaC__HAS_ID3LIB
libxmms_flac_la_SOURCES = $(plugin_sources)
@@ -52,5 +54,5 @@ endif
# for fix info see:
# http://lists.freshrpms.net/pipermail/rpm-list/2002-April/000746.html
# the workaround is the extra '-L$(top_builddir)/src/libFLAC/.libs'
-libxmms_flac_la_LIBADD = $(top_builddir)/src/plugin_common/libplugin_common.a $(top_builddir)/src/libFLAC/libFLAC.la -L$(top_builddir)/src/libFLAC/.libs @XMMS_LIBS@ @ID3LIB_LIBS@
+libxmms_flac_la_LIBADD = -lFLAC @XMMS_LIBS@ @ID3LIB_LIBS@
libxmms_flac_la_LDFLAGS = -module -avoid-version

12
audio/xmms-flac/patches/patch-src_plugin_xmms_charset_common_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_plugin_xmms_charset_common_c,v 1.1 2002/11/03 02:14:54 naddy Exp $
--- src/plugin_xmms/charset_common.c.orig Sat Nov 2 01:38:58 2002
+++ src/plugin_xmms/charset_common.c Sat Nov 2 01:39:09 2002
@@ -33,7 +33,7 @@
#include <langinfo.h>
#endif
-#include "charset.h"
+#include "charset_common.h"
/*************