summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2005-10-21 07:41:53 +0000
committerxtraeme <xtraeme@pkgsrc.org>2005-10-21 07:41:53 +0000
commit27ed76fb68a0b297ecc70a8ca65637602bbe1f67 (patch)
tree5963a40c8a1687d014c6a01e19791178f6894c7d /multimedia
parent1f0db6c2cc84b02878b0aa5d11369082bc8e2f77 (diff)
downloadpkgsrc-27ed76fb68a0b297ecc70a8ca65637602bbe1f67.tar.gz
Create and install links to the shared library to fix building of some
packages (the correct way would be libtoolizing it but I won't do that). Bump PKGREVISION.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xvidcore/Makefile3
-rw-r--r--multimedia/xvidcore/PLIST4
-rw-r--r--multimedia/xvidcore/distinfo4
-rw-r--r--multimedia/xvidcore/patches/patch-aa23
4 files changed, 23 insertions, 11 deletions
diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index 9544018edad..f369e7a3c0e 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/05/28 00:20:05 reed Exp $
+# $NetBSD: Makefile,v 1.13 2005/10/21 07:41:53 xtraeme Exp $
#
DISTNAME= xvidcore-1.0.3
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://downloads.xvid.org/downloads/
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/xvidcore/PLIST b/multimedia/xvidcore/PLIST
index d00c102de75..2acb3c02e48 100644
--- a/multimedia/xvidcore/PLIST
+++ b/multimedia/xvidcore/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2004/03/28 20:01:13 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/10/21 07:41:53 xtraeme Exp $
include/xvid.h
lib/libxvidcore.a
+lib/libxvidcore.so
+lib/libxvidcore.so.4
lib/libxvidcore.so.4.0
diff --git a/multimedia/xvidcore/distinfo b/multimedia/xvidcore/distinfo
index f4c7c21922f..a3731d4f02c 100644
--- a/multimedia/xvidcore/distinfo
+++ b/multimedia/xvidcore/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2005/05/20 12:54:54 drochner Exp $
+$NetBSD: distinfo,v 1.10 2005/10/21 07:41:53 xtraeme Exp $
SHA1 (xvidcore-1.0.3.tar.bz2) = 4b7de410e55c318cb68a829bb7e3619cbf40a1cf
RMD160 (xvidcore-1.0.3.tar.bz2) = 96e4d46f617ebb802c2a6cacbf64502356a70741
Size (xvidcore-1.0.3.tar.bz2) = 541841 bytes
-SHA1 (patch-aa) = 26e24daa64916e5b2428b6788e05aba1a89301c2
+SHA1 (patch-aa) = b43b94cad51f3121ccb7d0a4ece497ad29393ad2
SHA1 (patch-ab) = d0b79c482883191f99dfc4d870a90f52776366c9
diff --git a/multimedia/xvidcore/patches/patch-aa b/multimedia/xvidcore/patches/patch-aa
index bddbea70daa..cba5f25e116 100644
--- a/multimedia/xvidcore/patches/patch-aa
+++ b/multimedia/xvidcore/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2004/03/28 23:09:51 snj Exp $
+$NetBSD: patch-aa,v 1.2 2005/10/21 07:41:53 xtraeme Exp $
---- Makefile.orig 2004-02-29 05:25:11.000000000 -0800
-+++ Makefile 2004-03-28 14:32:24.000000000 -0800
-@@ -81,7 +81,7 @@ $(OBJECTS): platform.inc
+--- Makefile.orig 2004-12-19 12:38:46.000000000 +0100
++++ Makefile 2005-10-21 08:26:37.000000000 +0200
+@@ -82,7 +82,7 @@
$(BUILD_DIR):
@echo " D: $(BUILD_DIR)"
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1 2004/03/28 23:09:51 snj Exp $
#-----------------------------------------------------------------------------
# Generic assembly rule
-@@ -89,7 +89,7 @@ $(BUILD_DIR):
+@@ -90,7 +90,7 @@
.$(ASSEMBLY_EXTENSION).$(OBJECT_EXTENSION):
@echo " A: $(@D)/$(<F)"
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.1 2004/03/28 23:09:51 snj Exp $
@$(AS) $(AFLAGS) $< -o $(BUILD_DIR)/$@
#-----------------------------------------------------------------------------
-@@ -98,7 +98,7 @@ $(BUILD_DIR):
+@@ -99,7 +99,7 @@
.c.$(OBJECT_EXTENSION):
@echo " C: $(@D)/$(<F)"
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.1 2004/03/28 23:09:51 snj Exp $
@$(CC) -c $(ARCHITECTURE) $(BUS) $(ENDIANNESS) $(FEATURES) $(SPECIFIC_CFLAGS) $(CFLAGS) $< -o $(BUILD_DIR)/$@
#-----------------------------------------------------------------------------
-@@ -126,7 +126,7 @@ $(STATIC_LIB): $(BUILD_DIR) $(OBJECTS)
+@@ -127,7 +127,7 @@
$(SHARED_LIB): $(BUILD_DIR) $(OBJECTS)
@echo " L: $(@F)"
@@ -38,3 +38,12 @@ $NetBSD: patch-aa,v 1.1 2004/03/28 23:09:51 snj Exp $
@cd $(BUILD_DIR) && $(CC) $(LDFLAGS) $(OBJECTS) -o $(PRE_SHARED_LIB) $(SPECIFIC_LDFLAGS)
#-----------------------------------------------------------------------------
+@@ -139,6 +139,8 @@
+ @$(INSTALL) -d $(libdir)
+ @echo " I: $(libdir)/$(SHARED_LIB)"
+ @$(INSTALL) -m 755 $(BUILD_DIR)/$(SHARED_LIB) $(libdir)/$(SHARED_LIB)
++ @ln -s $(libdir)/$(SHARED_LIB) $(libdir)/libxvidcore.so
++ @ln -s $(libdir)/$(SHARED_LIB) $(libdir)/libxvidcore.so.$(API_MAJOR)
+ @echo " I: $(libdir)/$(STATIC_LIB)"
+ @$(INSTALL) -m 755 $(BUILD_DIR)/$(STATIC_LIB) $(libdir)/$(STATIC_LIB)
+ @echo " D: $(includedir)"