[145377] trunk/dports/audio/chromaprint

[khindenburg at macports.org]

Revision: 145377
          https://trac.macports.org/changeset/145377
Author:   khindenburg at macports.org
Date:     2016-02-03 06:13:48 -0800 (Wed, 03 Feb 2016)
Log Message:
-----------
chromaprint: update to 1.3

Modified Paths:
--------------
    trunk/dports/audio/chromaprint/Portfile

Removed Paths:
-------------
    trunk/dports/audio/chromaprint/files/newer-ffmpeg.patch
    trunk/dports/audio/chromaprint/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/audio/chromaprint/Portfile
===================================================================
--- trunk/dports/audio/chromaprint/Portfile	2016-02-03 14:01:29 UTC (rev 145376)
+++ trunk/dports/audio/chromaprint/Portfile	2016-02-03 14:13:48 UTC (rev 145377)
@@ -5,8 +5,7 @@
 PortGroup           cmake 1.0
 PortGroup           bitbucket 1.0
 
-bitbucket.setup     acoustid chromaprint 1.2
-revision            2
+bitbucket.setup     acoustid chromaprint 1.3
 categories          audio
 description         Chromaprint
 long_description    Chromaprint is the core component of the AcoustID \
@@ -21,13 +20,11 @@
 bitbucket.tarball_from downloads
 license             LGPL-2.1+
 
-checksums           rmd160  208ddea00c22451b6838ab8415834403e918b541 \
-                    sha256  822b8949a322ac04c6f8a3ed78f5e689bcc493c6ca0972bf627c913c8430031a
+checksums           rmd160  d0eb371dc08f2e205aaa44795efb044a353bc150 \
+                    sha256  bbeff57cd45e15d5fc45888cc21fbed158d6717a4e986786e999f79798eb27d0
 
 depends_lib         path:lib/libavcodec.dylib:ffmpeg
 
-patchfiles          patch-CMakeLists.txt.diff newer-ffmpeg.patch
-
 cmake.out_of_source yes
 
 configure.args-append -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=ON

Deleted: trunk/dports/audio/chromaprint/files/newer-ffmpeg.patch
===================================================================
--- trunk/dports/audio/chromaprint/files/newer-ffmpeg.patch	2016-02-03 14:01:29 UTC (rev 145376)
+++ trunk/dports/audio/chromaprint/files/newer-ffmpeg.patch	2016-02-03 14:13:48 UTC (rev 145377)
@@ -1,48 +0,0 @@
-commit 37092d380a28abcc63fa120499030a0f2b7df80f
-Author: Rodger Combs <rodger.combs at gmail.com>
-Date:   Fri Oct 2 14:48:01 2015 -0500
-
-    fpcalc: remove uses of deprecated lavc APIs
-
-Index: chromaprint-1.2/examples/fpcalc.c
-===================================================================
---- examples/fpcalc.c
-+++ examples/fpcalc.c
-@@ -17,10 +17,6 @@
- #define MAX(a, b) ((a) > (b) ? (a) : (b))
- #define MIN(a, b) ((a) < (b) ? (a) : (b))
- 
--#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0)
--#define avcodec_free_frame av_freep
--#endif
--
- int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name, int max_length, int *duration)
- {
- 	int ok = 0, remaining, length, consumed, codec_ctx_opened = 0, got_frame, stream_index;
-@@ -131,7 +127,7 @@ int decode_audio_file(ChromaprintContext
- 	remaining = max_length * codec_ctx->channels * codec_ctx->sample_rate;
- 	chromaprint_start(chromaprint_ctx, codec_ctx->sample_rate, codec_ctx->channels);
- 
--	frame = avcodec_alloc_frame();
-+	frame = av_frame_alloc();
- 
- 	while (1) {
- 		if (av_read_frame(format_ctx, &packet) < 0) {
-@@ -139,7 +135,7 @@ int decode_audio_file(ChromaprintContext
- 		}
- 
- 		if (packet.stream_index == stream_index) {
--			avcodec_get_frame_defaults(frame);
-+			av_frame_unref(frame);
- 
- 			got_frame = 0;
- 			consumed = avcodec_decode_audio4(codec_ctx, frame, &got_frame, &packet);
-@@ -196,7 +192,7 @@ finish:
- 
- done:
- 	if (frame) {
--		avcodec_free_frame(&frame);
-+		av_frame_free(&frame);
- 	}
- 	if (dst_data[0]) {
- 		av_freep(&dst_data[0]);

Deleted: trunk/dports/audio/chromaprint/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/audio/chromaprint/files/patch-CMakeLists.txt.diff	2016-02-03 14:01:29 UTC (rev 145376)
+++ trunk/dports/audio/chromaprint/files/patch-CMakeLists.txt.diff	2016-02-03 14:13:48 UTC (rev 145377)
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2014-08-26 11:57:36.000000000 -0500
-+++ CMakeLists.txt	2014-09-27 10:38:41.000000000 -0500
-@@ -132,7 +132,7 @@
- 	message(STATUS "Using KissFFT for FFT calculations")
- endif()
- 
--if(NOT APPLE AND NOT BUILD_FRAMEWORK)
-+if(NOT BUILD_FRAMEWORK)
- 	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libchromaprint.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc)
- 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
- endif()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160203/9497d01c/attachment.html>