Mon Dec 17 12:51:32 2012 UTC ()
make this build again


(drochner)
diff -r1.2 -r1.3 pkgsrc/multimedia/minidlna/distinfo
diff -r1.1 -r1.2 pkgsrc/multimedia/minidlna/files/BSDmakefile
diff -r1.1 -r1.2 pkgsrc/multimedia/minidlna/patches/patch-replace-glob3
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/minidlna/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/minidlna/distinfo 2012/10/25 10:25:27 1.2
+++ pkgsrc/multimedia/minidlna/distinfo 2012/12/17 12:51:32 1.3
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.2 2012/10/25 10:25:27 drochner Exp $ 1$NetBSD: distinfo,v 1.3 2012/12/17 12:51:32 drochner Exp $
2 2
3SHA1 (minidlna_1.0.25_src.tar.gz) = 33742f02367006c6e4af7128b91c830026e59b9f 3SHA1 (minidlna_1.0.25_src.tar.gz) = 33742f02367006c6e4af7128b91c830026e59b9f
4RMD160 (minidlna_1.0.25_src.tar.gz) = 7008ef98c03f820d9200c1b1db2ec2f7995ece6d 4RMD160 (minidlna_1.0.25_src.tar.gz) = 7008ef98c03f820d9200c1b1db2ec2f7995ece6d
5Size (minidlna_1.0.25_src.tar.gz) = 211756 bytes 5Size (minidlna_1.0.25_src.tar.gz) = 211756 bytes
6SHA1 (patch-aa) = 7eade704068ea67e8ced43453976aa2ef24b3ef8 6SHA1 (patch-aa) = 7eade704068ea67e8ced43453976aa2ef24b3ef8
7SHA1 (patch-ab) = 7e62ef89c7bf2029cacda3e43cfe41800b90201f 7SHA1 (patch-ab) = 7e62ef89c7bf2029cacda3e43cfe41800b90201f
8SHA1 (patch-conf) = f02d87c245efd80ca43158b172c13e10c2130610 8SHA1 (patch-conf) = f02d87c245efd80ca43158b172c13e10c2130610
9SHA1 (patch-icons) = f9bdf47cd8cd6ee67a3e011655fd0ce7d8a1dcc2 9SHA1 (patch-icons) = f9bdf47cd8cd6ee67a3e011655fd0ce7d8a1dcc2
10SHA1 (patch-image_utils.c) = 1f8a5d31aef9fa7182ac5ee40f9b9ad374a2772c 10SHA1 (patch-image_utils.c) = 1f8a5d31aef9fa7182ac5ee40f9b9ad374a2772c
11SHA1 (patch-inline) = 3bab5f706124d96492f6fd017b671e34c3f2bd59 11SHA1 (patch-inline) = 3bab5f706124d96492f6fd017b671e34c3f2bd59
12SHA1 (patch-lg) = 3889c03ca8118a7769266bb25687945701f3d29e 12SHA1 (patch-lg) = 3889c03ca8118a7769266bb25687945701f3d29e
13SHA1 (patch-minidlna.c) = 4c8de50a3de506cb6f34b43e60504a930f6f5282 13SHA1 (patch-minidlna.c) = 4c8de50a3de506cb6f34b43e60504a930f6f5282
14SHA1 (patch-other-subnets) = 3739394543005a658c73a62bd150a161d43253e1 14SHA1 (patch-other-subnets) = 3739394543005a658c73a62bd150a161d43253e1
15SHA1 (patch-replace-glob3) = 599bda0d6c2532956111b8d605b6227dd83040c5 15SHA1 (patch-replace-glob3) = 08f9676870e4143bdadbd68c8c09cf39aa504d89
16SHA1 (patch-scanner.c) = d07998a31ec8b890baa7cccc58d211af69953625 16SHA1 (patch-scanner.c) = d07998a31ec8b890baa7cccc58d211af69953625
17SHA1 (patch-tagutils.c) = 0010283c8a538024abf1dddd64e9b5446ec7ee02 17SHA1 (patch-tagutils.c) = 0010283c8a538024abf1dddd64e9b5446ec7ee02
18SHA1 (patch-tagutils_asf.h) = 855b7e59b657f1e6ea8d07b48c0ca261cd9ddacd 18SHA1 (patch-tagutils_asf.h) = 855b7e59b657f1e6ea8d07b48c0ca261cd9ddacd
19SHA1 (patch-tagutils_misc.c) = b49931d9a3d338576a8fb9911da1664085475aa6 19SHA1 (patch-tagutils_misc.c) = b49931d9a3d338576a8fb9911da1664085475aa6
20SHA1 (patch-upnpglobalvars.c) = fbe22ff08d1462bf6a3cc36c456cf41624bcbd4e 20SHA1 (patch-upnpglobalvars.c) = fbe22ff08d1462bf6a3cc36c456cf41624bcbd4e
21SHA1 (patch-upnphttp) = deeda56b30f06bbacdf9190ca18d65b2ae93e863 21SHA1 (patch-upnphttp) = deeda56b30f06bbacdf9190ca18d65b2ae93e863
22SHA1 (patch-utils-mpo) = 8f94873331d2d87f2b2652d131f506a12cf171b8 22SHA1 (patch-utils-mpo) = 8f94873331d2d87f2b2652d131f506a12cf171b8
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/minidlna/files/Attic/BSDmakefile (expand / switch to unified diff)

--- pkgsrc/multimedia/minidlna/files/Attic/BSDmakefile 2012/10/15 22:48:01 1.1
+++ pkgsrc/multimedia/minidlna/files/Attic/BSDmakefile 2012/12/17 12:51:32 1.2
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: BSDmakefile,v 1.1 2012/10/15 22:48:01 drochner Exp $ 1# $NetBSD: BSDmakefile,v 1.2 2012/12/17 12:51:32 drochner Exp $
2# from FreeBSD ports/net/minidlna 2# from FreeBSD ports/net/minidlna
3 3
4PROG= minidlna 4PROG= minidlna
5NOMAN= Ha-ha... 5NOMAN= Ha-ha...
6 6
7OS!= uname 7OS!= uname
8VERS!= uname -r 8VERS!= uname -r
9 9
10CFLAGS+=-I${FILESDIR} -I${.CURDIR} -I${LOCALBASE}/include -I${LOCALBASE}/include/libavcodec 10CFLAGS+=-I${.CURDIR} -I${LOCALBASE}/include #-I${LOCALBASE}/include/libavcodec
11CFLAGS+=-I${LOCALBASE}/include/libavutil -I${LOCALBASE}/include/libavformat 11#CFLAGS+=-I${LOCALBASE}/include/libavutil -I${LOCALBASE}/include/libavformat
12CFLAGS+=-DPREFIX='"${PREFIX}"' -DOS='"${OS}"' -DOSVERSION='"${VERS}"' 12CFLAGS+=-DPREFIX='"${PREFIX}"' -DOS='"${OS}"' -DOSVERSION='"${VERS}"'
13CFLAGS+=-Wformat -Wunused -Wall 13CFLAGS+=-Wformat -Wunused -Wall
14CFLAGS+=-Wno-deprecated-declarations 14CFLAGS+=-Wno-deprecated-declarations
15 15
16LDADD+= -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib 16LDADD+= -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
17LDADD+= -lsqlite3 -ljpeg -lexif -lid3tag -logg -lvorbis -lFLAC -lavformat 17LDADD+= -lsqlite3 -ljpeg -lexif -lid3tag -logg -lvorbis -lFLAC -lavformat
18 18
19SRCS= albumart.c daemonize.c getifaddr.c image_utils.c log.c \ 19SRCS= albumart.c daemonize.c getifaddr.c image_utils.c log.c \
20 metadata.c minidlna.c minissdp.c minixml.c options.c playlist.c \ 20 metadata.c minidlna.c minissdp.c minixml.c options.c playlist.c \
21 scanner.c sql.c upnpdescgen.c upnpevents.c upnpglobalvars.c \ 21 scanner.c sql.c upnpdescgen.c upnpevents.c upnpglobalvars.c \
22 upnphttp.c upnpreplyparse.c upnpsoap.c utils.c uuid.c 22 upnphttp.c upnpreplyparse.c upnpsoap.c utils.c uuid.c
23 23
24# TiVo-related sources still need massaging to compile on BSD: 24# TiVo-related sources still need massaging to compile on BSD:
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/minidlna/patches/Attic/patch-replace-glob3 (expand / switch to unified diff)

--- pkgsrc/multimedia/minidlna/patches/Attic/patch-replace-glob3 2012/10/15 22:48:02 1.1
+++ pkgsrc/multimedia/minidlna/patches/Attic/patch-replace-glob3 2012/12/17 12:51:32 1.2
@@ -1,25 +1,36 @@ @@ -1,25 +1,36 @@
1$NetBSD: patch-replace-glob3,v 1.1 2012/10/15 22:48:02 drochner Exp $ 1$NetBSD: patch-replace-glob3,v 1.2 2012/12/17 12:51:32 drochner Exp $
2 2
3--- metadata.c.orig 2012-06-29 21:11:29.000000000 +0000 3--- metadata.c.orig 2012-06-29 21:11:29.000000000 +0000
4+++ metadata.c 4+++ metadata.c
5@@ -25,6 +25,7 @@ 5@@ -25,14 +25,15 @@
6 #include <sys/types.h> 6 #include <sys/types.h>
7 #include <sys/stat.h> 7 #include <sys/stat.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9+#include <libgen.h> 9+#include <libgen.h>
10  10
11 #include <libexif/exif-loader.h> 11 #include <libexif/exif-loader.h>
12 #include "image_utils.h" 12 #include "image_utils.h"
 13 #include <jpeglib.h>
 14 #include <setjmp.h>
 15-#include <avutil.h>
 16-#include <avcodec.h>
 17-#include <avformat.h>
 18+#include <libavutil/avutil.h>
 19+#include <libavcodec/avcodec.h>
 20+#include <libavformat/avformat.h>
 21 #include "tagutils/tagutils.h"
 22
 23 #include "upnpglobalvars.h"
13@@ -194,8 +195,8 @@ check_for_captions(const char * path, sq 24@@ -194,8 +195,8 @@ check_for_captions(const char * path, sq
14 /* If we weren't given a detail ID, look for one. */ 25 /* If we weren't given a detail ID, look for one. */
15 if( !detailID ) 26 if( !detailID )
16 { 27 {
17- id = sql_get_text_field(db, "SELECT ID from DETAILS where PATH glob '%q.*'" 28- id = sql_get_text_field(db, "SELECT ID from DETAILS where PATH glob '%q.*'"
18- " and MIME glob 'video/*' limit 1", file); 29- " and MIME glob 'video/*' limit 1", file);
19+ id = sql_get_text_field(db, "SELECT ID from DETAILS where (PATH > '%q.' and PATH <= '%q.z'" 30+ id = sql_get_text_field(db, "SELECT ID from DETAILS where (PATH > '%q.' and PATH <= '%q.z'"
20+ " and MIME > 'video/' and MIME <= 'video/z') limit 1", file, file); 31+ " and MIME > 'video/' and MIME <= 'video/z') limit 1", file, file);
21 if( id ) 32 if( id )
22 { 33 {
23 //DEBUG DPRINTF(E_DEBUG, L_METADATA, "New file %s looks like a caption file.\n", path); 34 //DEBUG DPRINTF(E_DEBUG, L_METADATA, "New file %s looks like a caption file.\n", path);
24@@ -504,8 +505,8 @@ GetAudioMetadata(const char * path, char 35@@ -504,8 +505,8 @@ GetAudioMetadata(const char * path, char
25 " (PATH, SIZE, TIMESTAMP, DURATION, CHANNELS, BITRATE, SAMPLERATE, DATE," 36 " (PATH, SIZE, TIMESTAMP, DURATION, CHANNELS, BITRATE, SAMPLERATE, DATE,"