Subject: Re: Invalid libSDL.so version number in package devel/SDL-1.2.9 ?
To: None <tv@duh.org, reed@reedmedia.net>
From: Gilles Dauphin <Gilles.Dauphin@enst.fr>
List: tech-pkg
Date: 10/12/2005 10:58:39
Please add the wished patch to SDL for Solaris10 x86 (was in a PR number ???):
--------------------------------------------------------------------------
--- /net/redhot/usr/pkgsrc/devel/SDL/Makefile.common.orig Wed Jun 1
20:02:42
2005
+++ /net/redhot/usr/pkgsrc/devel/SDL/Makefile.common Fri Aug 26 11:14:46 2005
@@ -20,7 +20,7 @@
.include "../../mk/bsd.prefs.mk"
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386" && ${OPSYS} != "SunOS"
. include "../../devel/binutils/buildlink3.mk"
BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
NASMFLAGS_ELF= -f elf
@@ -32,6 +32,10 @@
CONFIGURE_ARGS+= --disable-esd
CONFIGURE_ARGS+= --disable-nas
+.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386"
+CONFIGURE_ARGS+= --disable-nasm
+.endif
+
CONFIGURE_ARGS+= --enable-video-aalib
CONFIGURE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
MAKE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
----------------------------------------------------------------------
> From: "Jeremy C. Reed" <reed@reedmedia.net>
>
>
> On Tue, 11 Oct 2005, Todd Vierling wrote:
>
> >>
/ftp/pub/NetBSD/packages/pkgsrc-2005Q2/NetBSD-2.0.2/amd64/devel/SDL-1.2.8nb1.tgz
> >> (and i386 too)
> >> has:
> >> lib/libSDL.so.1 -> libSDL.so.1.0.8
> >>
> >> And
/ftp/pub/NetBSD/packages/pkgsrc-2005Q3/NetBSD-2.0/i386/devel/SDL-1.2.9.tgz
> >> has:
> >> lib/libSDL.so.2 -> libSDL.so.2.0.9
> >
> > Looks like SDL's buildlink3.mk needs a BUILDLINK_RECOMMENDED bump, and
> > (unfortunately) everything depending on SDL directly needs a PKGREVISION
> > bump.
>
> I was not sure yet if it was a problem with the versioning, see thsi diff
> between 1.2.8 and 1.2.9 configure:
>
> SDL_MAJOR_VERSION=1
> SDL_MINOR_VERSION=2
> -SDL_MICRO_VERSION=8
> -SDL_INTERFACE_AGE=1
> -SDL_BINARY_AGE=8
> +SDL_MICRO_VERSION=9
> +SDL_INTERFACE_AGE=2
> +SDL_BINARY_AGE=9
> SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
>
>
> @@ -1592,9 +1593,9 @@
>
> # libtool versioning
> LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
> -LT_CURRENT=$SDL_INTERFACE_AGE
> -LT_REVISION=$SDL_BINARY_AGE
> -LT_AGE=0
> +LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE`
> +LT_REVISION=$SDL_INTERFACE_AGE
> +LT_AGE=`expr $SDL_BINARY_AGE - $SDL_INTERFACE_AGE`
>
>
> The src/Makefile.in difference related to this is:
>
> libSDL_la_LDFLAGS = \
> -no-undefined \
> + -release $(LT_RELEASE) \
> -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
>
>
> Jeremy C. Reed
>
> BSD News, BSD tutorials, BSD links
> http://www.bsdnewsletter.com/