Skip to content

Commit 70374be

Browse files
committed
Updated
1 parent b3f09fd commit 70374be

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FFMPEG_VERSION=ffmpeg-7.1.1
77
CHROMAPRINT_VERSION=chromaprint-1.5.1
88

99
# CGO configuration - set CGO vars for C++ libraries
10-
CGO_ENV=PKG_CONFIG_PATH="$(shell realpath ${PREFIX})/lib/pkgconfig" CGO_LDFLAGS_ALLOW="-(W|D).*" CGO_LDFLAGS="-lstdc++"
10+
CGO_ENV=PKG_CONFIG_PATH="$(shell realpath ${PREFIX})/lib/pkgconfig" CGO_LDFLAGS_ALLOW="-(W|D).*" CGO_LDFLAGS="-lstdc++ -lavutil"
1111

1212
# Build flags
1313
BUILD_MODULE := $(shell cat go.mod | head -1 | cut -d ' ' -f 2)
@@ -87,7 +87,7 @@ ffmpeg: ffmpeg-build
8787
###############################################################################
8888
# CHROMAPRINT
8989

90-
# Download ffmpeg sources
90+
# Download chromaprint sources
9191
${BUILD_DIR}/${CHROMAPRINT_VERSION}:
9292
@if [ ! -d "$(BUILD_DIR)/$(CHROMAPRINT_VERSION)" ]; then \
9393
echo "Downloading $(CHROMAPRINT_VERSION)"; \
@@ -100,14 +100,16 @@ ${BUILD_DIR}/${CHROMAPRINT_VERSION}:
100100

101101
# Configure chromaprint
102102
.PHONY: chromaprint-configure
103-
chromaprint-configure: mkdir ${BUILD_DIR}/${CHROMAPRINT_VERSION}
103+
chromaprint-configure: mkdir ${BUILD_DIR}/${CHROMAPRINT_VERSION} ffmpeg
104104
@echo "Configuring ${CHROMAPRINT_VERSION} => ${PREFIX}"
105105
cmake \
106106
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
107107
-DCMAKE_BUILD_TYPE=Release \
108108
-DBUILD_SHARED_LIBS=0 \
109109
-DBUILD_TESTS=0 \
110110
-DBUILD_TOOLS=0 \
111+
-DFFT_LIB=avfft \
112+
-DCMAKE_PREFIX_PATH="$(shell realpath ${PREFIX})" \
111113
--install-prefix "$(shell realpath ${PREFIX})" \
112114
-S ${BUILD_DIR}/${CHROMAPRINT_VERSION} \
113115
-B ${BUILD_DIR}
@@ -124,7 +126,7 @@ chromaprint-build: chromaprint-configure
124126
chromaprint: chromaprint-build
125127
@echo "Installing ${CHROMAPRINT_VERSION} => ${PREFIX}"
126128
@cd $(BUILD_DIR) && make install
127-
@sed -i.bak 's/Libs: -L\${libdir} -lchromaprint/Libs: -L\${libdir} -lchromaprint -lstdc++/g' "${PREFIX}/lib/pkgconfig/libchromaprint.pc"
129+
@sed -i.bak 's/Libs: -L\${libdir} -lchromaprint/Libs: -L\${libdir} -lchromaprint -lstdc++ -lavutil/g' "${PREFIX}/lib/pkgconfig/libchromaprint.pc"
128130
@rm -f "${PREFIX}/lib/pkgconfig/libchromaprint.pc.bak"
129131

130132
###############################################################################

pkg/generator/sine.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"time"
88

99
// Packages
10-
"github.com/mutablelogic/go-media"
10+
media "github.com/mutablelogic/go-media"
1111
ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
1212
ff "github.com/mutablelogic/go-media/sys/ffmpeg71"
1313
)

pkg/generator/yuv420p.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"errors"
66

77
// Packages
8-
"github.com/mutablelogic/go-media"
8+
media "github.com/mutablelogic/go-media"
99
ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
1010
ff "github.com/mutablelogic/go-media/sys/ffmpeg71"
1111
)

sys/chromaprint/chromaprint.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import (
1010
// CGO
1111

1212
/*
13-
#cgo pkg-config: libchromaprint
13+
#cgo pkg-config: libchromaprint libavcodec
14+
#cgo LDFLAGS: -lstdc++
1415
#cgo darwin LDFLAGS: -framework Accelerate
1516
#include <chromaprint.h>
1617
*/

0 commit comments

Comments
 (0)