make this work with NetBSD's version of libmagic

This commit is contained in:
drochner 2010-08-31 19:18:14 +00:00
parent a0010b829d
commit 5315165dc8
3 changed files with 20 additions and 2 deletions

View file

@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.2 2010/05/21 01:53:41 obache Exp $
# $NetBSD: Makefile,v 1.3 2010/08/31 19:18:14 drochner Exp $
DISTNAME= gmediaserver-0.13.0
PKGREVISION= 1
CATEGORIES= multimedia net
MASTER_SITES= http://download.savannah.gnu.org/releases/gmediaserver/

View file

@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.1.1.1 2010/05/20 04:27:33 obache Exp $
$NetBSD: distinfo,v 1.2 2010/08/31 19:18:14 drochner Exp $
SHA1 (gmediaserver-0.13.0.tar.gz) = 5b868bc3c3d3bf0c2c550a4fc618c586a2640799
RMD160 (gmediaserver-0.13.0.tar.gz) = 57fb849172d28e8adcff2234c787d552c16bde9a
Size (gmediaserver-0.13.0.tar.gz) = 668281 bytes
SHA1 (patch-aa) = 8913274c78c646a3dd3e26a0b33d309697302eb9
SHA1 (patch-ab) = 27122e8f08eb63ee4c3571bc91f2cbf5d057538c

View file

@ -0,0 +1,16 @@
$NetBSD: patch-ab,v 1.1 2010/08/31 19:18:14 drochner Exp $
--- src/metadata.c.orig 2007-10-20 09:41:32.000000000 +0000
+++ src/metadata.c
@@ -1018,7 +1018,10 @@ scan_entry(const char *fullpath, const c
bool
init_metadata(void)
{
- magic_cookie = magic_open(MAGIC_SYMLINK|MAGIC_MIME|MAGIC_ERROR);
+#ifndef MAGIC_MIME_TYPE /* old version */
+#define MAGIC_MIME_TYPE MAGIC_MIME
+#endif
+ magic_cookie = magic_open(MAGIC_SYMLINK|MAGIC_MIME_TYPE|MAGIC_ERROR);
if (magic_cookie == NULL) {
warn(_("cannot initialize magic library\n"));
return false;