Update to 0.7.4: bug fixes.

This commit is contained in:
naddy 2002-09-03 01:01:52 +00:00
parent 71c8904fd3
commit 2a3582c25f
5 changed files with 5 additions and 132 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.1.1.1 2002/05/22 22:47:46 naddy Exp $
# $OpenBSD: Makefile,v 1.2 2002/09/03 01:01:52 naddy Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
COMMENT= "XMMS input plugin for playing SID files"
DISTNAME= xmms-sid-0.7.3
DISTNAME= xmms-sid-0.7.4
CATEGORIES= audio
NEED_VERSION= 1.530
HOMEPAGE= http://www.tnsp.org/xmms-sid.php
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>

View File

@ -1,3 +1,3 @@
MD5 (xmms-sid-0.7.3.tar.gz) = 5bbf9d85f15bbcd8aae0a54adbf5a582
RMD160 (xmms-sid-0.7.3.tar.gz) = 3931bdf610806dfda6f4a690dc497b01645a464b
SHA1 (xmms-sid-0.7.3.tar.gz) = 770a896449c1fde2c548d8ea9daa640acc67cfbe
MD5 (xmms-sid-0.7.4.tar.gz) = ec67a95f8d43b5446b6b01e497343b96
RMD160 (xmms-sid-0.7.4.tar.gz) = e359daf6fd3a7f3d9a40ae9ca8daa2c27ddb6f63
SHA1 (xmms-sid-0.7.4.tar.gz) = 9ccf412e7c9759ae69ca78dee0895bdb724df9e8

View File

@ -1,100 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2002/05/22 22:47:46 naddy Exp $
--- configure.orig Tue Feb 26 02:26:42 2002
+++ configure Tue May 21 01:13:16 2002
@@ -1740,6 +1740,16 @@ newos6*)
lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
+openbsd*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ else
+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+ fi
+ ;;
+
osf3* | osf4* | osf5*)
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -2505,7 +2515,14 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Allow CC to be a program name with arguments.
@@ -3002,7 +3019,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -3406,10 +3425,24 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
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
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
@@ -3886,9 +3919,22 @@ newsos6)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ sys_lib_search_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_xmms-sid_cc,v 1.1.1.1 2002/05/22 22:47:46 naddy Exp $
--- src/xmms-sid.cc.orig Tue May 21 13:10:10 2002
+++ src/xmms-sid.cc Tue May 21 13:10:19 2002
@@ -190,7 +190,7 @@ static void * xs_play_loop(void *arg)
int fxlen, tn;
struct sidTuneInfo sidInf;
char *name;
- enum AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_LE : FMT_U8;
+ enum AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8;
gint chn = xs_emuConf.channels;
tune->getInfo(sidInf);

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_xs_about_c,v 1.1.1.1 2002/05/22 22:47:46 naddy Exp $
--- src/xs_about.c.orig Tue May 21 23:05:14 2002
+++ src/xs_about.c Tue May 21 23:06:15 2002
@@ -78,7 +78,10 @@ void xs_aboutbox(void)
gtk_box_pack_start (GTK_BOX (hbox1), frame1, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (frame1), 4);
+ gtk_widget_realize (xs_aboutwin);
+
/* The pixmap */
+ style = gtk_widget_get_style (xs_aboutwin);
pixmap = gdk_pixmap_create_from_xpm_d(xs_aboutwin->window, &pixmask,
&style->bg[GTK_STATE_NORMAL],
(gchar **) xmms_sid_logo_xpm);