Date: Sun, 8 Dec 2002 05:21:52 +0100 (CET) From: osgene@web.de To: FreeBSD-gnats-submit@FreeBSD.org Cc: esk@ira.uka.de Subject: ports/46089: multimedia/xmms Vorbis plugin built incorrectly Message-ID: <200212080421.gB84Lqox010322@badger.home>
next in thread | raw e-mail | index | archive | help
>Number: 46089 >Category: ports >Synopsis: multimedia/xmms Vorbis plugin built incorrectly >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 07 20:30:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Eugene Ossintsev <osgene@web.de> >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD badger.home 4.7-STABLE FreeBSD 4.7-STABLE #0: Sat Dec 7 22:12:06 CET 2002 root@badger.home:/usr/obj/usr/src/sys/BADGER i386 >Description: The multimedia/xmms Vorbis plugin is built incorrectly since 'configure' looks for the glibc's iconv* functions (Linux way). On FreeBSD they are in a separate library. The applied patch deletes the unnecessary lines from Input/vorbis/utf8.c . It replaces also the iconv-related lines in 'configure' with the empty ones to keep the original line numbering. >How-To-Repeat: Load non-ascii ogg files into the playlist. The file information will be displayed "as is", in UTF-8. It's certainly incorrect. >Fix: diff -urN xmms.orig/Makefile xmms/Makefile --- xmms.orig/Makefile Thu Nov 28 01:09:51 2002 +++ xmms/Makefile Sun Dec 8 04:08:49 2002 @@ -7,7 +7,7 @@ PORTNAME= xmms PORTVERSION= 1.2.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES+= multimedia audio MASTER_SITES= ftp://ftp.xmms.org/xmms/1.2.x/ \ http://www.xmms.org/files/1.2.x/ \ diff -urN xmms.orig/files/patch-ad xmms/files/patch-ad --- xmms.orig/files/patch-ad Tue May 14 08:21:23 2002 +++ xmms/files/patch-ad Sun Dec 8 03:57:48 2002 @@ -1,8 +1,5 @@ - -$FreeBSD: ports/multimedia/xmms/files/patch-ad,v 1.12 2002/05/14 06:21:23 sobomax Exp $ - ---- configure.orig Mon Mar 4 23:57:01 2002 -+++ configure Tue May 14 09:06:50 2002 +--- configure.orig Sun Dec 8 03:57:36 2002 ++++ configure Sun Dec 8 03:56:25 2002 @@ -10576,7 +10576,7 @@ GMSGFMT="OLD_PO_FILE_INPUT=yes $GMSGFMT" MSGFMT="OLD_PO_FILE_INPUT=yes $MSGFMT" @@ -12,6 +9,117 @@ +@@ -11651,60 +11651,60 @@ + fi + done + +-for ac_func in iconv_open +-do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:11658: checking for $ac_func" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <<EOF +-#line 11663 "configure" +-#include "confdefs.h" +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include <assert.h> +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char $ac_func(); + +-int main() { + +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +-choke me +-#else +-$ac_func(); +-#endif + +-; return 0; } +-EOF +-if { (eval echo configure:11686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_$ac_func=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_$ac_func=no" +-fi +-rm -f conftest* +-fi + +-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` +- cat >> confdefs.h <<EOF +-#define $ac_tr_func 1 +-EOF +- +-else +- echo "$ac_t""no" 1>&6 +-fi +-done ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + echo $ac_n "checking for nl_langinfo(CODESET)""... $ac_c" 1>&6 @@ -12673,10 +12673,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; diff -urN xmms.orig/files/patch-vorbis xmms/files/patch-vorbis --- xmms.orig/files/patch-vorbis Thu Jan 1 01:00:00 1970 +++ xmms/files/patch-vorbis Fri Dec 6 01:57:03 2002 @@ -0,0 +1,37 @@ +--- Input/vorbis/utf8.c.orig Fri Dec 6 01:55:12 2002 ++++ Input/vorbis/utf8.c Fri Dec 6 01:55:57 2002 +@@ -22,11 +22,7 @@ + #include <stdlib.h> + #include <glib.h> + #include <string.h> +- +-#ifdef HAVE_ICONV_OPEN + #include <iconv.h> +-#endif +- + #include <errno.h> + + #ifdef HAVE_CODESET +@@ -51,7 +47,6 @@ + } + + +-#ifdef HAVE_ICONV_OPEN + static char* convert_string(const char *string, char *from, char *to) + { + size_t outleft, outsize, length; +@@ -110,14 +105,6 @@ + return out; + } + +-#else +- +-static char* convert_string(const char *string, char *from, char *to) +-{ +- return g_strdup(string); +-} +- +-#endif + + char* convert_to_utf8(const char *string) + { >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212080421.gB84Lqox010322>