Thu Oct 2 13:52:02 2008 UTC ()
Fix build on AMD64. Mark as DESTDIR safe.


(joerg)
diff -r1.12 -r1.13 pkgsrc/multimedia/vls/Makefile
diff -r1.7 -r1.8 pkgsrc/multimedia/vls/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/vls/patches/patch-ak
diff -r0 -r1.1 pkgsrc/multimedia/vls/patches/patch-al
cvs diff -r1.12 -r1.13 pkgsrc/multimedia/vls/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/vls/Attic/Makefile 2006/08/06 05:16:51 1.12
+++ pkgsrc/multimedia/vls/Attic/Makefile 2008/10/02 13:52:02 1.13
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1# $NetBSD: Makefile,v 1.12 2006/08/06 05:16:51 kristerw Exp $ 1# $NetBSD: Makefile,v 1.13 2008/10/02 13:52:02 joerg Exp $
2# 2#
3 3
4DISTNAME= vls-0.5.6 4DISTNAME= vls-0.5.6
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= http://download.videolan.org/pub/videolan/vls/0.5.6/ 7MASTER_SITES= http://download.videolan.org/pub/videolan/vls/0.5.6/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.videolan.org/ 10HOMEPAGE= http://www.videolan.org/
11COMMENT= VideoLAN Server 11COMMENT= VideoLAN Server
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
13USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
14USE_TOOLS+= gmake 16USE_TOOLS+= gmake
15GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
16# two versions of 0.5.6 out 18# two versions of 0.5.6 out
17DIST_SUBDIR= ${PKGNAME_NOREV} 19DIST_SUBDIR= ${PKGNAME_NOREV}
18 20
19CONFIGURE_ARGS+= --with-dvbpsi=${BUILDLINK_PREFIX.libdvbpsi} 21CONFIGURE_ARGS+= --with-dvbpsi=${BUILDLINK_PREFIX.libdvbpsi}
20 22
21.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
22 24
23.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" 25.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD"
24CXXFLAGS+= -D__STDC_LIMIT_MACROS 26CXXFLAGS+= -D__STDC_LIMIT_MACROS
25.endif 27.endif
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/vls/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/vls/Attic/distinfo 2006/06/26 11:30:05 1.7
+++ pkgsrc/multimedia/vls/Attic/distinfo 2008/10/02 13:52:02 1.8
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: distinfo,v 1.7 2006/06/26 11:30:05 rillig Exp $ 1$NetBSD: distinfo,v 1.8 2008/10/02 13:52:02 joerg Exp $
2 2
3SHA1 (vls-0.5.6/vls-0.5.6.tar.gz) = f61acab2d1b9093677de516b63aef534b0cd81b7 3SHA1 (vls-0.5.6/vls-0.5.6.tar.gz) = f61acab2d1b9093677de516b63aef534b0cd81b7
4RMD160 (vls-0.5.6/vls-0.5.6.tar.gz) = 5fdcd718db4caa624ad092c4cdddca2fc62b0d15 4RMD160 (vls-0.5.6/vls-0.5.6.tar.gz) = 5fdcd718db4caa624ad092c4cdddca2fc62b0d15
5Size (vls-0.5.6/vls-0.5.6.tar.gz) = 802901 bytes 5Size (vls-0.5.6/vls-0.5.6.tar.gz) = 802901 bytes
6SHA1 (patch-aa) = cadf79b4a1244492d48def104590468b52098527 6SHA1 (patch-aa) = cadf79b4a1244492d48def104590468b52098527
7SHA1 (patch-ab) = 30b9ba716e80972a7d4cb0cf75efc715086812b1 7SHA1 (patch-ab) = 30b9ba716e80972a7d4cb0cf75efc715086812b1
8SHA1 (patch-ac) = bcc44065d4c45db8c96b5ddd307d61242d70f002 8SHA1 (patch-ac) = bcc44065d4c45db8c96b5ddd307d61242d70f002
9SHA1 (patch-ad) = 1a75b2990c60afdbe47575bfe745be0d86a379c0 9SHA1 (patch-ad) = 1a75b2990c60afdbe47575bfe745be0d86a379c0
10SHA1 (patch-ae) = 7cb52a8e9d7a095ecb01af2ebfdfc639d0886e59 10SHA1 (patch-ae) = 7cb52a8e9d7a095ecb01af2ebfdfc639d0886e59
11SHA1 (patch-af) = 5cda5b979012a143345f179c9f95c4e2c709e59f 11SHA1 (patch-af) = 5cda5b979012a143345f179c9f95c4e2c709e59f
12SHA1 (patch-ag) = 9c45a5be74f46c67caca043a28de7d36bfc9564c 12SHA1 (patch-ag) = 9c45a5be74f46c67caca043a28de7d36bfc9564c
13SHA1 (patch-ah) = e3936ced3b16e97a242102f525dfb0bbfd11d33f 13SHA1 (patch-ah) = e3936ced3b16e97a242102f525dfb0bbfd11d33f
14SHA1 (patch-ai) = 4fdebf473eb5be7937ef8e5ac7d63e474b9418b3 14SHA1 (patch-ai) = 4fdebf473eb5be7937ef8e5ac7d63e474b9418b3
15SHA1 (patch-aj) = 9e8255f4c45c74a241333511358ca8f14898f2da 15SHA1 (patch-aj) = 9e8255f4c45c74a241333511358ca8f14898f2da
 16SHA1 (patch-ak) = 979c146119af5372eba02d9624e1a10b17474f88
 17SHA1 (patch-al) = b07580dfe5c0314bfe6baa26cfef455fca5102fa
File Added: pkgsrc/multimedia/vls/patches/Attic/patch-ak
$NetBSD: patch-ak,v 1.1 2008/10/02 13:52:02 joerg Exp $

--- src/core/common.h.orig	2008-10-02 15:44:20.000000000 +0200
+++ src/core/common.h
@@ -71,28 +71,6 @@
 #include <stl_config.h>
 #endif
 
-// Basic types definitions
-typedef signed char         s8;
-typedef signed short        s16;
-typedef signed int          s32;
-#ifdef _WIN32
-typedef __int64             s64;
-#else
-typedef signed long long    s64;
-#endif
-
-typedef unsigned char       u8;
-typedef unsigned short      u16;
-typedef unsigned int        u32;
-#ifdef _WIN32
-typedef unsigned __int64    u64;
-#else
-typedef unsigned long long  u64;
-#endif
-
-// Byte type
-typedef u8                  byte;
- 
 // Handles
 typedef void*               handle;
 
@@ -131,6 +109,9 @@ typedef unsigned long       count;
 #   endif
 #endif
 
+// Byte type
+typedef u8                  byte;
+ 
 #if defined( WIN32)
 typedef int                    ssize_t;
 #endif
File Added: pkgsrc/multimedia/vls/patches/Attic/patch-al
$NetBSD: patch-al,v 1.1 2008/10/02 13:52:02 joerg Exp $

--- src/core/hashtable.cpp.orig	2008-10-02 15:45:19.000000000 +0200
+++ src/core/hashtable.cpp
@@ -97,7 +97,7 @@ u32 C_HashMethod<u16>::Hash(u16 iKey) co
 
 u32 C_HashMethod<handle>::Hash(handle hKey) const
 {
-  return (u32)hKey % m_uiMaxHash;
+  return (u32)(size_t)hKey % m_uiMaxHash;
 }