[125495] trunk/dports/devel/libdlna
devans at macports.org
devans at macports.org
Thu Sep 18 13:55:08 PDT 2014
Revision: 125495
https://trac.macports.org/changeset/125495
Author: devans at macports.org
Date: 2014-09-18 13:55:08 -0700 (Thu, 18 Sep 2014)
Log Message:
-----------
libdlna: update to version 0.2.4, remove outdated patches, patch for ffmpeg-2.4 compatibility.
Modified Paths:
--------------
trunk/dports/devel/libdlna/Portfile
trunk/dports/devel/libdlna/files/patch-Makefile.diff
trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff
Removed Paths:
-------------
trunk/dports/devel/libdlna/files/patch-configure.diff
trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part10.c.diff
trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part2.c.diff
trunk/dports/devel/libdlna/files/patch-src-containers.c.diff
trunk/dports/devel/libdlna/files/patch-src-profiles.h.diff
Modified: trunk/dports/devel/libdlna/Portfile
===================================================================
--- trunk/dports/devel/libdlna/Portfile 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/Portfile 2014-09-18 20:55:08 UTC (rev 125495)
@@ -4,8 +4,7 @@
PortSystem 1.0
name libdlna
-version 0.2.3
-revision 5
+version 0.2.4
license LGPL-2.1
categories devel
platforms darwin
@@ -20,14 +19,11 @@
homepage http://libdlna.geexbox.org/
master_sites ${homepage}releases
use_bzip2 yes
-checksums md5 2c974f95b711e5fd07f78fc4ebfcca66
-patchfiles patch-configure.diff \
- patch-src-profiles.c.diff \
- patch-src-profiles.h.diff \
- patch-src-av_mpeg4_part2.c.diff \
- patch-src-av_mpeg4_part10.c.diff \
- patch-src-containers.c.diff \
+checksums rmd160 6083bdcb7b5bc048f5b81373ef452145ba913861 \
+ sha256 4b2787392ea5ff61c0056bbaa0bb00a2c83d595d20b5658741658cddd17678c5
+
+patchfiles patch-src-profiles.c.diff \
patch-src-upnp-dms.c.diff
platform darwin {
Modified: trunk/dports/devel/libdlna/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/libdlna/files/patch-Makefile.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-Makefile.diff 2014-09-18 20:55:08 UTC (rev 125495)
@@ -1,6 +1,6 @@
---- src/Makefile 2008-03-16 10:04:39.000000000 -0400
-+++ src/Makefile.new 2008-03-16 10:05:37.000000000 -0400
-@@ -13,7 +13,7 @@
+--- src/Makefile.orig 2012-02-26 11:34:00.000000000 -0800
++++ src/Makefile 2014-09-17 06:28:58.000000000 -0700
+@@ -21,7 +21,7 @@
endif
LIBNAME = libdlna
@@ -9,7 +9,7 @@
LIBNAME_STATIC = ${LIBNAME}.a
LIBNAME_VERSION = $(LIBNAME_SHARED).$(VERSION)
LIBNAME_MAJOR = $(LIBNAME_SHARED).$(shell echo $(VERSION) | cut -f1 -d.)
-@@ -89,13 +89,12 @@
+@@ -97,8 +97,7 @@
@echo "#############################################"
lib_shared: lib_shared_info_pre $(LOBJS) lib_shared_info_post
@@ -19,6 +19,9 @@
$(LN) -sf $(LIBNAME_VERSION) $(LIBNAME_MAJOR)
$(LN) -sf $(LIBNAME_MAJOR) $(LIBNAME_SHARED)
+@@ -111,7 +110,7 @@
+ ( find -name '*.[chS]' -print ) | xargs ctags -a;
+
clean:
- -$(RM) -f *.o *.lo *.a *.so*
+ -$(RM) -f *.o *.lo *.a *.dylib*
Deleted: trunk/dports/devel/libdlna/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/libdlna/files/patch-configure.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-configure.diff 2014-09-18 20:55:08 UTC (rev 125495)
@@ -1,23 +0,0 @@
---- configure.orig 2007-11-26 12:47:43.000000000 -0800
-+++ configure 2009-03-15 14:18:03.000000000 -0700
-@@ -610,9 +610,9 @@
- fi
-
- echolog "Checking for libavformat ..."
--check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
-+check_lib libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
- echolog "Checking for libavcodec ..."
--check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
-+check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
-
- #################################################
- # version
-@@ -688,7 +688,7 @@
- fi
- append_config "EXTRALIBS=$extralibs"
-
--append_config "OPTFLAGS=$CFLAGS"
-+append_config "CFLAGS=$CFLAGS"
- append_config "LDFLAGS=$LDFLAGS"
- append_config "INSTALL=$INSTALL"
-
Deleted: trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part10.c.diff
===================================================================
--- trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part10.c.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part10.c.diff 2014-09-18 20:55:08 UTC (rev 125495)
@@ -1,11 +0,0 @@
---- src/av_mpeg4_part10.c.orig 2009-03-15 14:51:45.000000000 -0700
-+++ src/av_mpeg4_part10.c 2009-03-15 14:52:45.000000000 -0700
-@@ -26,7 +26,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
-
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
-
- #include "dlna_internals.h"
- #include "profiles.h"
Deleted: trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part2.c.diff
===================================================================
--- trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part2.c.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part2.c.diff 2014-09-18 20:55:08 UTC (rev 125495)
@@ -1,11 +0,0 @@
---- src/av_mpeg4_part2.c.orig 2009-03-15 14:52:04.000000000 -0700
-+++ src/av_mpeg4_part2.c 2009-03-15 14:53:20.000000000 -0700
-@@ -26,7 +26,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
-
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
-
- #include "dlna_internals.h"
- #include "profiles.h"
Deleted: trunk/dports/devel/libdlna/files/patch-src-containers.c.diff
===================================================================
--- trunk/dports/devel/libdlna/files/patch-src-containers.c.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-src-containers.c.diff 2014-09-18 20:55:08 UTC (rev 125495)
@@ -1,11 +0,0 @@
---- src/containers.c.orig 2009-03-15 14:29:07.000000000 -0700
-+++ src/containers.c 2009-03-15 14:29:36.000000000 -0700
-@@ -4,7 +4,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
-
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
-
- #include "containers.h"
- #include "profiles.h"
Modified: trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff
===================================================================
--- trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff 2014-09-18 20:55:08 UTC (rev 125495)
@@ -1,45 +1,20 @@
---- src/profiles.c.orig 2012-10-30 14:12:10.000000000 -0600
-+++ src/profiles.c 2012-10-30 14:13:49.000000000 -0600
-@@ -204,14 +204,24 @@
+--- src/profiles.c.orig 2014-09-17 10:09:56.000000000 -0700
++++ src/profiles.c 2014-09-17 10:11:37.000000000 -0700
+@@ -287,7 +287,7 @@
+ return NULL;
+ }
- for (i = 0; i < ctx->nb_streams; i++)
+- if (av_find_stream_info (ctx) < 0)
++ if (avformat_find_stream_info (ctx, NULL) < 0)
{
-+#if LIBAVFORMAT_BUILD < 4621
- if (audio_stream == -1 &&
- ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
-+#else
-+ if (audio_stream == -1 &&
-+ ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
-+#endif
- {
- audio_stream = i;
- continue;
- }
-+#if LIBAVFORMAT_BUILD < 4621
- else if (video_stream == -1 &&
- ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO)
-+#else
-+ else if (video_stream == -1 &&
-+ ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-+#endif
- {
- video_stream = i;
- continue;
-@@ -280,7 +290,7 @@
- if (!dlna->inited)
- dlna = dlna_init ();
-
-- if (av_open_input_file (&ctx, filename, NULL, 0, NULL) != 0)
-+ if (avformat_open_input (&ctx, filename, NULL, NULL) != 0)
- {
if (dlna->verbosity)
- fprintf (stderr, "can't open file: %s\n", filename);
-@@ -334,7 +344,7 @@
+ fprintf (stderr, "can't find stream info\n");
+@@ -334,7 +334,7 @@
p = p->next;
}
- av_close_input_file (ctx);
-+ avformat_close_input (ctx);
++ avformat_close_input (&ctx);
free (codecs);
return profile;
}
Deleted: trunk/dports/devel/libdlna/files/patch-src-profiles.h.diff
===================================================================
--- trunk/dports/devel/libdlna/files/patch-src-profiles.h.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-src-profiles.h.diff 2014-09-18 20:55:08 UTC (rev 125495)
@@ -1,13 +0,0 @@
---- src/profiles.h.orig 2009-03-15 14:24:42.000000000 -0700
-+++ src/profiles.h 2009-03-15 14:25:50.000000000 -0700
-@@ -22,8 +22,8 @@
- #ifndef _PROFILES_H_
- #define _PROFILES_H_
-
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-
- #include "dlna_internals.h"
- #include "containers.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140918/63ae8467/attachment.html>
More information about the macports-changes
mailing list