summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2012-12-17 12:51:32 +0000
committerdrochner <drochner@pkgsrc.org>2012-12-17 12:51:32 +0000
commit183e52620f443b45d078936ccfb2f8665c05461f (patch)
tree82bb3b5213cab18003102193ef3f4c2beaff1de8 /multimedia
parent2ed4f7abf9224b8bacd3b0224ae14c52218aa1ab (diff)
downloadpkgsrc-183e52620f443b45d078936ccfb2f8665c05461f.tar.gz
make this build again
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/minidlna/distinfo4
-rw-r--r--multimedia/minidlna/files/BSDmakefile6
-rw-r--r--multimedia/minidlna/patches/patch-replace-glob315
3 files changed, 18 insertions, 7 deletions
diff --git a/multimedia/minidlna/distinfo b/multimedia/minidlna/distinfo
index cd899c7ec25..c0b15f35ad7 100644
--- a/multimedia/minidlna/distinfo
+++ b/multimedia/minidlna/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2012/10/25 10:25:27 drochner Exp $
+$NetBSD: distinfo,v 1.3 2012/12/17 12:51:32 drochner Exp $
SHA1 (minidlna_1.0.25_src.tar.gz) = 33742f02367006c6e4af7128b91c830026e59b9f
RMD160 (minidlna_1.0.25_src.tar.gz) = 7008ef98c03f820d9200c1b1db2ec2f7995ece6d
@@ -12,7 +12,7 @@ SHA1 (patch-inline) = 3bab5f706124d96492f6fd017b671e34c3f2bd59
SHA1 (patch-lg) = 3889c03ca8118a7769266bb25687945701f3d29e
SHA1 (patch-minidlna.c) = 4c8de50a3de506cb6f34b43e60504a930f6f5282
SHA1 (patch-other-subnets) = 3739394543005a658c73a62bd150a161d43253e1
-SHA1 (patch-replace-glob3) = 599bda0d6c2532956111b8d605b6227dd83040c5
+SHA1 (patch-replace-glob3) = 08f9676870e4143bdadbd68c8c09cf39aa504d89
SHA1 (patch-scanner.c) = d07998a31ec8b890baa7cccc58d211af69953625
SHA1 (patch-tagutils.c) = 0010283c8a538024abf1dddd64e9b5446ec7ee02
SHA1 (patch-tagutils_asf.h) = 855b7e59b657f1e6ea8d07b48c0ca261cd9ddacd
diff --git a/multimedia/minidlna/files/BSDmakefile b/multimedia/minidlna/files/BSDmakefile
index 98342b7352f..643c7c6179c 100644
--- a/multimedia/minidlna/files/BSDmakefile
+++ b/multimedia/minidlna/files/BSDmakefile
@@ -1,4 +1,4 @@
-# $NetBSD: BSDmakefile,v 1.1 2012/10/15 22:48:01 drochner Exp $
+# $NetBSD: BSDmakefile,v 1.2 2012/12/17 12:51:32 drochner Exp $
# from FreeBSD ports/net/minidlna
PROG= minidlna
@@ -7,8 +7,8 @@ NOMAN= Ha-ha...
OS!= uname
VERS!= uname -r
-CFLAGS+=-I${FILESDIR} -I${.CURDIR} -I${LOCALBASE}/include -I${LOCALBASE}/include/libavcodec
-CFLAGS+=-I${LOCALBASE}/include/libavutil -I${LOCALBASE}/include/libavformat
+CFLAGS+=-I${.CURDIR} -I${LOCALBASE}/include #-I${LOCALBASE}/include/libavcodec
+#CFLAGS+=-I${LOCALBASE}/include/libavutil -I${LOCALBASE}/include/libavformat
CFLAGS+=-DPREFIX='"${PREFIX}"' -DOS='"${OS}"' -DOSVERSION='"${VERS}"'
CFLAGS+=-Wformat -Wunused -Wall
CFLAGS+=-Wno-deprecated-declarations
diff --git a/multimedia/minidlna/patches/patch-replace-glob3 b/multimedia/minidlna/patches/patch-replace-glob3
index 2daa90e0573..bc0e06925b6 100644
--- a/multimedia/minidlna/patches/patch-replace-glob3
+++ b/multimedia/minidlna/patches/patch-replace-glob3
@@ -1,8 +1,8 @@
-$NetBSD: patch-replace-glob3,v 1.1 2012/10/15 22:48:02 drochner Exp $
+$NetBSD: patch-replace-glob3,v 1.2 2012/12/17 12:51:32 drochner Exp $
--- metadata.c.orig 2012-06-29 21:11:29.000000000 +0000
+++ metadata.c
-@@ -25,6 +25,7 @@
+@@ -25,14 +25,15 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -10,6 +10,17 @@ $NetBSD: patch-replace-glob3,v 1.1 2012/10/15 22:48:02 drochner Exp $
#include <libexif/exif-loader.h>
#include "image_utils.h"
+ #include <jpeglib.h>
+ #include <setjmp.h>
+-#include <avutil.h>
+-#include <avcodec.h>
+-#include <avformat.h>
++#include <libavutil/avutil.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ #include "tagutils/tagutils.h"
+
+ #include "upnpglobalvars.h"
@@ -194,8 +195,8 @@ check_for_captions(const char * path, sq
/* If we weren't given a detail ID, look for one. */
if( !detailID )