Date: Sat, 18 Apr 2009 00:14:56 GMT From: Alberto Villa <villa.alberto@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/133826: [maintainer update] multimedia/mlt: fix upgrading (before 7.2 release) Message-ID: <200904180014.n3I0Eu0s024796@www.freebsd.org> Resent-Message-ID: <200904180020.n3I0K28b011875@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133826
>Category: ports
>Synopsis: [maintainer update] multimedia/mlt: fix upgrading (before 7.2 release)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Apr 18 00:20:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Alberto Villa
>Release: FreeBSD 7-STABLE
>Organization:
>Environment:
FreeBSD echo.hoth 7.2-PRERELEASE FreeBSD 7.2-PRERELEASE #1: Tue Apr 7 01:06:52 CEST 2009 root@echo.hoth:/usr/obj/usr/src/sys/TPR60 i386
>Description:
port cannot be upgraded if an older version is installed, because LDFLAGS make it link to old mlt libraries
>How-To-Repeat:
1. install mlt 0.3.2
2. upgade to mlt 0.3.6
3. crash
>Fix:
here's a patch to update the port (no PORTREVISION bump i guess); patches were sent to upstream
added files:
files/patch-src-modules-resample-Makefile
files/patch-src-modules-vorbis-Makefile
Patch attached with submission follows:
diff -ruN /usr/ports/multimedia/mlt/Makefile mlt/Makefile
--- /usr/ports/multimedia/mlt/Makefile 2009-04-12 23:21:47.000000000 +0200
+++ mlt/Makefile 2009-04-17 20:48:27.000000000 +0200
@@ -14,7 +14,7 @@
USE_GNOME= libxml2 gnomehack
USE_QT_VER= 4
-QT_COMPONENTS= #will be defined later
+QT_COMPONENTS= # will be defined later
USE_SDL= image
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug \
@@ -23,7 +23,6 @@
--enable-westley
USE_GMAKE= yes
CFLAGS+= -I${LOCALBASE}/include
-MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
USE_LDCONFIG= yes
PORTDOCS= AUTHORS ChangeLog COPYING \
diff -ruN /usr/ports/multimedia/mlt/files/patch-src-modules-resample-Makefile mlt/files/patch-src-modules-resample-Makefile
--- /usr/ports/multimedia/mlt/files/patch-src-modules-resample-Makefile 1970-01-01 01:00:00.000000000 +0100
+++ mlt/files/patch-src-modules-resample-Makefile 2009-04-17 21:07:43.000000000 +0200
@@ -0,0 +1,14 @@
+--- src/modules/resample/Makefile.orig 2008-02-04 08:24:19.000000000 +0100
++++ src/modules/resample/Makefile 2009-04-17 21:05:44.000000000 +0200
+@@ -5,9 +5,9 @@
+ OBJS = factory.o \
+ filter_resample.o
+
+-CFLAGS += -I../..
++CFLAGS += -I../.. `pkg-config --cflags samplerate`
+
+-LDFLAGS += -lsamplerate
++LDFLAGS += `pkg-config --libs samplerate`
+
+ LDFLAGS+=-L../../framework -lmlt
+
diff -ruN /usr/ports/multimedia/mlt/files/patch-src-modules-vorbis-Makefile mlt/files/patch-src-modules-vorbis-Makefile
--- /usr/ports/multimedia/mlt/files/patch-src-modules-vorbis-Makefile 1970-01-01 01:00:00.000000000 +0100
+++ mlt/files/patch-src-modules-vorbis-Makefile 2009-04-17 21:07:57.000000000 +0200
@@ -0,0 +1,15 @@
+--- src/modules/vorbis/Makefile.orig 2008-02-04 08:24:19.000000000 +0100
++++ src/modules/vorbis/Makefile 2009-04-17 21:05:44.000000000 +0200
+@@ -6,8 +6,11 @@
+ producer_vorbis.o
+
+ CFLAGS += -I../..
++CFLAGS += `pkg-config --cflags vorbis`
++CFLAGS += `pkg-config --cflags vorbisfile`
+
+-LDFLAGS += -lvorbisfile -lvorbis
++LDFLAGS += `pkg-config --libs vorbis`
++LDFLAGS += `pkg-config --libs vorbisfile`
+
+ LDFLAGS+=-L../../framework -lmlt
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904180014.n3I0Eu0s024796>