SHARED_LIBS

drop SONAME encoding
don't link the library against libc, adjust WANTLIB accordingly
bump PKGNAME

tested with multimedia/transcode, which is the only port using xvidcore

OK alek@
This commit is contained in:
jakemsr 2006-01-08 22:12:38 +00:00
parent 1b72ec7421
commit 5841cc886c
3 changed files with 31 additions and 4 deletions

View File

@ -1,9 +1,11 @@
# $OpenBSD: Makefile,v 1.3 2005/06/13 06:09:36 mbalmer Exp $
# $OpenBSD: Makefile,v 1.4 2006/01/08 22:12:38 jakemsr Exp $
COMMENT= "ISO MPEG-4 compliant video codec"
DISTNAME= xvidcore-1.0.3
PKGNAME= ${DISTNAME}p0
CATEGORIES= multimedia
SHARED_LIBS= xvidcore 4.0
HOMEPAGE= http://www.xvid.org/
@ -14,13 +16,15 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m
WANTLIB= m
MASTER_SITES= http://downloads.xvid.org/downloads/
WRKBUILD= ${WRKSRC}/build/generic
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-assembly
CONFIGURE_ENV= API_MAJOR=${LIBxvidcore_VERSION:R} \
API_MINOR=${LIBxvidcore_VERSION:E}
.if ${MACHINE_ARCH} == "vax" || ${MACHINE_ARCH} == "m88k"
MAKE_FLAGS+= SHARED_LIB=""

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-build_generic_configure,v 1.1 2006/01/08 22:12:38 jakemsr Exp $
--- build/generic/configure.orig Sun Dec 19 03:38:55 2004
+++ build/generic/configure Sat Dec 24 03:48:11 2005
@@ -1316,8 +1316,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-API_MAJOR="4"
-API_MINOR="0"
+API_MAJOR="$API_MAJOR"
+API_MINOR="$API_MINOR"
minimum_nasm_patch_version=34
nasm_prog="nasm"
@@ -3824,7 +3824,7 @@ case "$target_os" in
echo "${ECHO_T}ok" >&6
STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
- SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm"
+ SPECIFIC_LDFLAGS="-shared -lm"
SPECIFIC_CFLAGS="-fPIC"
;;
[cC][yY][gG][wW][iI][nN]*|mingw32*|mks*)

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2004/10/25 16:56:44 naddy Exp $
@lib lib/libxvidcore.so.4.0
@comment $OpenBSD: PFRAG.shared,v 1.2 2006/01/08 22:12:38 jakemsr Exp $
@lib lib/libxvidcore.so.${LIBxvidcore_VERSION}