Date: Fri, 5 Jun 2009 08:00:36 GMT From: Alberto Villa <villa.alberto@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/135278: [maintainer update] Update port: multimedia/mlt 0.3.8 -> 0.4.2 Message-ID: <200906050800.n5580aJF097130@www.freebsd.org> Resent-Message-ID: <200906050810.n558A47O037089@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 135278 >Category: ports >Synopsis: [maintainer update] Update port: multimedia/mlt 0.3.8 -> 0.4.2 >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: Fri Jun 05 08:10:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Alberto Villa >Release: FreeBSD 7-STABLE >Organization: >Environment: FreeBSD echo.hoth 7.2-STABLE FreeBSD 7.2-STABLE #0: Mon Jun 1 17:26:15 UTC 2009 root@echo.hoth:/usr/obj/usr/src/sys/TPR60 i386 >Description: update to 0.4.2 >How-To-Repeat: >Fix: deleted files: files/patch-src-modules-avformat-Makefile files/patch-src-modules-dv-Makefile files/patch-src-modules-gtk2-Makefile files/patch-src-modules-jackrack-Makefile files/patch-src-modules-resample-Makefile files/patch-src-modules-sdl-Makefile files/patch-src-modules-sox-Makefile files/patch-src-modules-vorbis-Makefile files/patch-src-modules-westley-Makefile multimedia/mlt++ is now part of this (upstream source makeover), so it has to be deleted (and deinstalled before updating this port... i marked a conflict, hope it's enough) i think the line in ports/MOVED should be something like this (it could be better): multimedia/mlt++|multimedia/mlt|2009-06-05|Project reorganization Patch attached with submission follows: diff -ruN /home/albi/mlt.orig/Makefile /usr/ports/multimedia/mlt/Makefile --- /home/albi/mlt.orig/Makefile 2009-06-05 01:43:58.959243428 +0200 +++ /usr/ports/multimedia/mlt/Makefile 2009-06-05 09:09:48.287477918 +0200 @@ -5,7 +5,7 @@ # $FreeBSD: ports/multimedia/mlt/Makefile,v 1.5 2009/05/01 21:37:35 miwi Exp $ PORTNAME= mlt -PORTVERSION= 0.3.8 +PORTVERSION= 0.4.2 CATEGORIES= multimedia MASTER_SITES= SFE @@ -18,15 +18,18 @@ MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-debug \ - --enable-gpl \ - --enable-sdl \ - --enable-westley + --enable-gpl USE_GMAKE= yes CFLAGS+= -I${LOCALBASE}/include USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/mlt +CONFLICTS= mlt++-[0-9]* + +NOT_FOR_ARCHS= sparc64 +NOT_FOR_ARCHS_REASON_sparc64= does not compile on sparc64 (invokes i386 asm) + PORTDOCS= AUTHORS ChangeLog COPYING \ - GPL NEWS README docs demo + NEWS README docs demo OPTIONS= AVFORMAT "Avformat module" on \ DV "Quasar DV Codec module" on \ @@ -34,19 +37,15 @@ GTK2 "GTK2 module" on \ JACKRACK "JACK Rack module" on \ KINO "Kino module" on \ - MMX "MMX support (ignored on x86-64)" on \ QIMAGE "Qimage module" on \ RESAMPLE "Secret Rabbit Code module" on \ SOX "Sound eXchange module" on \ - SSE "SSE support (requires MMX)" on \ VORBIS "Vorbis module" on .include <bsd.port.pre.mk> .ifdef(WITH_AVFORMAT) -# one of them could be disabled -LIB_DEPENDS+= avformat.1:${PORTSDIR}/multimedia/ffmpeg \ - swscale.1:${PORTSDIR}/multimedia/ffmpeg +LIB_DEPENDS+= avformat.1:${PORTSDIR}/multimedia/ffmpeg CONFIGURE_ARGS+= --enable-avformat \ --avformat-swscale PLIST_SUB+= AVFORMAT="" @@ -102,12 +101,6 @@ PLIST_SUB+= KINO="@comment " .endif -.if defined(WITH_MMX) && ${MACHINE_CPU:Mmmx} != "" -CONFIGURE_ARGS+= --enable-mmx -.else -CONFIGURE_ARGS+= --disable-mmx -.endif - .ifdef(WITH_QIMAGE) CONFIGURE_ARGS+= --enable-qimage \ --qimage-includedir="${QT_INCDIR}" \ @@ -137,15 +130,6 @@ PLIST_SUB+= SOX="@comment " .endif -# sse can be enabled only with mmx -.if defined(WITH_MMX) && ${MACHINE_CPU:Mmmx} != "" -.if defined(WITH_SSE) && ${MACHINE_CPU:Msse} != "" -CONFIGURE_ARGS+= --enable-sse -.else -CONFIGURE_ARGS+= --disable-sse -.endif -.endif - .ifdef(WITH_VORBIS) LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+= --enable-vorbis @@ -155,15 +139,14 @@ PLIST_SUB+= VORBIS="@comment " .endif -.if ${ARCH} == "sparc64" -IGNORE= does not compile on sparc64 (invokes i386 asm) -.endif - pre-configure: @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure + ${WRKSRC}/configure \ + ${WRKSRC}/src/swig/*/build @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/src/*/Makefile + ${WRKSRC}/src/framework/Makefile \ + ${WRKSRC}/src/melt/Makefile \ + ${WRKSRC}/src/modules/*/Makefile @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ ${WRKSRC}/Makefile diff -ruN /home/albi/mlt.orig/distinfo /usr/ports/multimedia/mlt/distinfo --- /home/albi/mlt.orig/distinfo 2009-06-05 01:43:58.959243428 +0200 +++ /usr/ports/multimedia/mlt/distinfo 2009-06-05 01:44:55.685110357 +0200 @@ -1,3 +1,3 @@ -MD5 (mlt-0.3.8.tar.gz) = 5d7f8d4ecda0d57da35e3ff333073d12 -SHA256 (mlt-0.3.8.tar.gz) = cea314c08cf2a9256ef50f9cd09202f1c8c778ad278c324112e3c8a9d3b28e24 -SIZE (mlt-0.3.8.tar.gz) = 765811 +MD5 (mlt-0.4.2.tar.gz) = e1f3d89989571d0c5efccfb3d96f345c +SHA256 (mlt-0.4.2.tar.gz) = 069abee48f9400ad8af0b63a55811d666a2e049221523e434b59d53908619b04 +SIZE (mlt-0.4.2.tar.gz) = 734746 diff -ruN /home/albi/mlt.orig/files/patch-src-modules-avformat-Makefile /usr/ports/multimedia/mlt/files/patch-src-modules-avformat-Makefile --- /home/albi/mlt.orig/files/patch-src-modules-avformat-Makefile 2009-06-05 01:43:58.939243635 +0200 +++ /usr/ports/multimedia/mlt/files/patch-src-modules-avformat-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ ---- src/modules/avformat/Makefile.orig 2009-04-22 11:12:04.000000000 +0200 -+++ src/modules/avformat/Makefile 2009-04-22 11:15:13.000000000 +0200 -@@ -1,6 +1,13 @@ - include ../../../config.mak -+ -+CFLAGS += -I../.. -+ -+LDFLAGS += -L../../framework -lmlt -+ - include config.mak - -+LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -+ - ifndef CODECS - TARGET = ../libmltffmpeg$(LIBSUF) - else -@@ -25,12 +32,6 @@ - CFLAGS += -DCODECS - endif - --CFLAGS+=-I../.. -- --LDFLAGS+=-L../../framework -- --LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt -- - ifdef SWSCALE - CFLAGS+=-DSWSCALE - LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX) diff -ruN /home/albi/mlt.orig/files/patch-src-modules-dv-Makefile /usr/ports/multimedia/mlt/files/patch-src-modules-dv-Makefile --- /home/albi/mlt.orig/files/patch-src-modules-dv-Makefile 2009-06-05 01:43:58.949243671 +0200 +++ /usr/ports/multimedia/mlt/files/patch-src-modules-dv-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ ---- src/modules/dv/Makefile.orig 2009-04-22 11:18:29.000000000 +0200 -+++ src/modules/dv/Makefile 2009-04-22 11:18:48.000000000 +0200 -@@ -8,9 +8,9 @@ - - CFLAGS += `pkg-config --cflags libdv` -I../.. - -+LDFLAGS+=-L../../framework -lmlt - LDFLAGS += `pkg-config --libs libdv` - --LDFLAGS+=-L../../framework -lmlt - - SRCS := $(OBJS:.o=.c) - diff -ruN /home/albi/mlt.orig/files/patch-src-modules-gtk2-Makefile /usr/ports/multimedia/mlt/files/patch-src-modules-gtk2-Makefile --- /home/albi/mlt.orig/files/patch-src-modules-gtk2-Makefile 2009-06-05 01:43:58.939243635 +0200 +++ /usr/ports/multimedia/mlt/files/patch-src-modules-gtk2-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ ---- src/modules/gtk2/Makefile.orig 2009-04-22 11:19:10.000000000 +0200 -+++ src/modules/gtk2/Makefile 2009-04-22 11:19:34.000000000 +0200 -@@ -5,6 +5,9 @@ - - OBJS = factory.o - -+CFLAGS += -I../.. -+LDFLAGS+=-L../../framework -lmlt -+ - ifdef USE_GTK2 - OBJS += consumer_gtk2.o - CFLAGS += `pkg-config gtk+-2.0 --cflags` -@@ -29,9 +32,6 @@ - LDFLAGS += `pkg-config pangoft2 --libs` - endif - --CFLAGS += -I../.. --LDFLAGS+=-L../../framework -lmlt -- - SRCS := $(OBJS:.o=.c) - - all: $(TARGET) diff -ruN /home/albi/mlt.orig/files/patch-src-modules-jackrack-Makefile /usr/ports/multimedia/mlt/files/patch-src-modules-jackrack-Makefile --- /home/albi/mlt.orig/files/patch-src-modules-jackrack-Makefile 2009-06-05 01:43:58.939243635 +0200 +++ /usr/ports/multimedia/mlt/files/patch-src-modules-jackrack-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ ---- src/modules/jackrack/Makefile.orig 2009-04-22 11:19:54.000000000 +0200 -+++ src/modules/jackrack/Makefile 2009-04-22 11:20:06.000000000 +0200 -@@ -17,11 +17,11 @@ - CFLAGS += `xml2-config --cflags` - CFLAGS += `pkg-config glib-2.0 --cflags` - -+LDFLAGS+=-L../../framework -lmlt - LDFLAGS += `pkg-config --libs jack` - LDFLAGS += `xml2-config --libs` - LDFLAGS += `pkg-config glib-2.0 --libs` - --LDFLAGS+=-L../../framework -lmlt - - SRCS := $(OBJS:.o=.c) - diff -ruN /home/albi/mlt.orig/files/patch-src-modules-resample-Makefile /usr/ports/multimedia/mlt/files/patch-src-modules-resample-Makefile --- /home/albi/mlt.orig/files/patch-src-modules-resample-Makefile 2009-06-05 01:43:58.939243635 +0200 +++ /usr/ports/multimedia/mlt/files/patch-src-modules-resample-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ ---- src/modules/resample/Makefile.orig 2009-04-22 11:02:49.000000000 +0200 -+++ src/modules/resample/Makefile 2009-04-22 11:04:43.000000000 +0200 -@@ -6,10 +6,10 @@ - filter_resample.o - - CFLAGS += -I../.. -+CFLAGS += `pkg-config --cflags samplerate` - --LDFLAGS += -lsamplerate -- --LDFLAGS+=-L../../framework -lmlt -+LDFLAGS += -L../../framework -lmlt -+LDFLAGS += `pkg-config --libs samplerate` - - SRCS := $(OBJS:.o=.c) - diff -ruN /home/albi/mlt.orig/files/patch-src-modules-sdl-Makefile /usr/ports/multimedia/mlt/files/patch-src-modules-sdl-Makefile --- /home/albi/mlt.orig/files/patch-src-modules-sdl-Makefile 2009-06-05 01:43:58.939243635 +0200 +++ /usr/ports/multimedia/mlt/files/patch-src-modules-sdl-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ ---- src/modules/sdl/Makefile.orig 2009-04-22 11:21:20.000000000 +0200 -+++ src/modules/sdl/Makefile 2009-04-22 11:21:35.000000000 +0200 -@@ -18,9 +18,9 @@ - - CFLAGS +=-I../.. `sdl-config --cflags` - -+LDFLAGS +=-L../../framework -lmlt - LDFLAGS +=`sdl-config --libs` - --LDFLAGS +=-L../../framework -lmlt - - ifeq ($(WITH_SDL_IMAGE),1) - OBJS += producer_sdl_image.o diff -ruN /home/albi/mlt.orig/files/patch-src-modules-sox-Makefile /usr/ports/multimedia/mlt/files/patch-src-modules-sox-Makefile --- /home/albi/mlt.orig/files/patch-src-modules-sox-Makefile 2009-06-05 01:43:58.949243671 +0200 +++ /usr/ports/multimedia/mlt/files/patch-src-modules-sox-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ ---- src/modules/sox/Makefile.orig 2009-04-22 11:21:46.000000000 +0200 -+++ src/modules/sox/Makefile 2009-04-22 11:22:11.000000000 +0200 -@@ -1,4 +1,9 @@ - include ../../../config.mak -+ -+CFLAGS += -I../../ -+ -+LDFLAGS += -L../../framework -lmlt -+ - include config.mak - - TARGET = ../libmltsox$(LIBSUF) -@@ -6,10 +11,6 @@ - OBJS = factory.o \ - filter_sox.o - --CFLAGS += -I../../ -- --LDFLAGS += -L../../framework -lmlt -- - SRCS := $(OBJS:.o=.c) - - all: $(TARGET) diff -ruN /home/albi/mlt.orig/files/patch-src-modules-vorbis-Makefile /usr/ports/multimedia/mlt/files/patch-src-modules-vorbis-Makefile --- /home/albi/mlt.orig/files/patch-src-modules-vorbis-Makefile 2009-06-05 01:43:58.939243635 +0200 +++ /usr/ports/multimedia/mlt/files/patch-src-modules-vorbis-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ ---- src/modules/vorbis/Makefile.orig 2009-04-22 11:04:56.000000000 +0200 -+++ src/modules/vorbis/Makefile 2009-04-22 11:06:14.000000000 +0200 -@@ -6,10 +6,12 @@ - producer_vorbis.o - - CFLAGS += -I../.. -+CFLAGS += `pkg-config --cflags vorbis` -+CFLAGS += `pkg-config --cflags vorbisfile` - --LDFLAGS += -lvorbisfile -lvorbis -- --LDFLAGS+=-L../../framework -lmlt -+LDFLAGS += -L../../framework -lmlt -+LDFLAGS += `pkg-config --libs vorbis` -+LDFLAGS += `pkg-config --libs vorbisfile` - - SRCS := $(OBJS:.o=.c) - diff -ruN /home/albi/mlt.orig/files/patch-src-modules-westley-Makefile /usr/ports/multimedia/mlt/files/patch-src-modules-westley-Makefile --- /home/albi/mlt.orig/files/patch-src-modules-westley-Makefile 2009-06-05 01:43:58.949243671 +0200 +++ /usr/ports/multimedia/mlt/files/patch-src-modules-westley-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ ---- src/modules/westley/Makefile.orig 2009-04-22 11:22:27.000000000 +0200 -+++ src/modules/westley/Makefile 2009-04-22 11:22:41.000000000 +0200 -@@ -8,9 +8,9 @@ - - CFLAGS += -I../../ `xml2-config --cflags` - -+LDFLAGS+=-L../../framework -lmlt - LDFLAGS += `xml2-config --libs` - --LDFLAGS+=-L../../framework -lmlt - - SRCS := $(OBJS:.o=.c) - diff -ruN /home/albi/mlt.orig/pkg-plist /usr/ports/multimedia/mlt/pkg-plist --- /home/albi/mlt.orig/pkg-plist 2009-06-05 01:43:58.959243428 +0200 +++ /usr/ports/multimedia/mlt/pkg-plist 2009-06-05 02:12:46.014454915 +0200 @@ -1,8 +1,27 @@ -bin/albino -bin/humperdink -bin/inigo -bin/miracle -bin/mlt-config +bin/melt +include/mlt++/Mlt.h +include/mlt++/MltConsumer.h +include/mlt++/MltDeque.h +include/mlt++/MltEvent.h +include/mlt++/MltFactory.h +include/mlt++/MltField.h +include/mlt++/MltFilter.h +include/mlt++/MltFilteredConsumer.h +include/mlt++/MltFrame.h +include/mlt++/MltGeometry.h +include/mlt++/MltMultitrack.h +include/mlt++/MltParser.h +include/mlt++/MltPlaylist.h +include/mlt++/MltProducer.h +include/mlt++/MltProfile.h +include/mlt++/MltProperties.h +include/mlt++/MltPushConsumer.h +include/mlt++/MltRepository.h +include/mlt++/MltService.h +include/mlt++/MltTokeniser.h +include/mlt++/MltTractor.h +include/mlt++/MltTransition.h +include/mlt++/config.h include/mlt/framework/mlt.h include/mlt/framework/mlt_cache.h include/mlt/framework/mlt_consumer.h @@ -28,39 +47,23 @@ include/mlt/framework/mlt_tractor.h include/mlt/framework/mlt_transition.h include/mlt/framework/mlt_types.h -include/mlt/miracle/miracle_local.h -include/mlt/miracle/miracle_log.h -include/mlt/miracle/miracle_server.h -include/mlt/valerie/valerie.h -include/mlt/valerie/valerie_notifier.h -include/mlt/valerie/valerie_parser.h -include/mlt/valerie/valerie_remote.h -include/mlt/valerie/valerie_response.h -include/mlt/valerie/valerie_socket.h -include/mlt/valerie/valerie_status.h -include/mlt/valerie/valerie_tokeniser.h -include/mlt/valerie/valerie_util.h -lib/libmiracle.so -lib/libmiracle.so.0.3.8 -lib/libmiracle.so.1 +lib/libmlt++.so +lib/libmlt++.so.0.4.2 +lib/libmlt++.so.2 lib/libmlt.so -lib/libmlt.so.0.3.8 +lib/libmlt.so.0.4.2 lib/libmlt.so.1 -lib/libvalerie.so -lib/libvalerie.so.0.3.8 -lib/libvalerie.so.1 %%AVFORMAT%%lib/mlt/libmltavformat.so lib/mlt/libmltcore.so lib/mlt/libmltdgraft.so %%DV%%lib/mlt/libmltdv.so lib/mlt/libmlteffectv.so -lib/mlt/libmltfezzik.so %%FREI0R%%lib/mlt/libmltfrei0r.so %%GTK2%%lib/mlt/libmltgtk2.so -lib/mlt/libmltinigo.so %%JACKRACK%%lib/mlt/libmltjackrack.so lib/mlt/libmltkdenlive.so %%KINO%%lib/mlt/libmltkino.so +lib/mlt/libmltmelt.so lib/mlt/libmltmotion_est.so lib/mlt/libmltnormalize.so lib/mlt/libmltoldfilm.so @@ -69,16 +72,16 @@ %%RESAMPLE%%lib/mlt/libmltresample.so lib/mlt/libmltsdl.so %%SOX%%lib/mlt/libmltsox.so -lib/mlt/libmltvalerie.so lib/mlt/libmltvmfx.so %%VORBIS%%lib/mlt/libmltvorbis.so -lib/mlt/libmltwestley.so lib/mlt/libmltxine.so +lib/mlt/libmltxml.so +libdata/pkgconfig/mlt++.pc libdata/pkgconfig/mlt-framework.pc -libdata/pkgconfig/mlt-miracle.pc -libdata/pkgconfig/mlt-valerie.pc %%AVFORMAT%%%%DATADIR%%/avformat/producer_avformat.yml -%%DATADIR%%/data_fx.properties +%%DATADIR%%/core/data_fx.properties +%%DATADIR%%/core/loader.dict +%%DATADIR%%/core/loader.ini %%DATADIR%%/feeds/NTSC/data_fx.properties %%DATADIR%%/feeds/NTSC/obscure.properties %%DATADIR%%/feeds/PAL/border.properties @@ -86,8 +89,6 @@ %%DATADIR%%/feeds/PAL/etv.properties %%DATADIR%%/feeds/PAL/example.properties %%DATADIR%%/feeds/PAL/obscure.properties -%%DATADIR%%/fezzik.dict -%%DATADIR%%/fezzik.ini %%DATADIR%%/lumas/NTSC/luma01.pgm %%DATADIR%%/lumas/NTSC/luma02.pgm %%DATADIR%%/lumas/NTSC/luma03.pgm @@ -150,7 +151,6 @@ %%DATADIR%%/oldfilm/oldfilm.svg %%DATADIR%%/oldfilm/tcolor.svg %%DATADIR%%/oldfilm/vignette.svg -%%DATADIR%%/packages.dat %%DATADIR%%/profiles/atsc_1080i_50 %%DATADIR%%/profiles/atsc_1080i_60 %%DATADIR%%/profiles/atsc_1080p_2398 @@ -194,7 +194,8 @@ %%DATADIR%%/profiles/svcd_pal_wide %%DATADIR%%/profiles/vcd_ntsc %%DATADIR%%/profiles/vcd_pal -%%DATADIR%%/westley.dtd +%%DATADIR%%/xml/mlt-xml.dtd +@dirrm %%DATADIR%%/xml @dirrm %%DATADIR%%/profiles @dirrm %%DATADIR%%/oldfilm @dirrm %%DATADIR%%/lumas/PAL @@ -203,10 +204,10 @@ @dirrm %%DATADIR%%/feeds/PAL @dirrm %%DATADIR%%/feeds/NTSC @dirrm %%DATADIR%%/feeds +@dirrm %%DATADIR%%/core %%AVFORMAT%%@dirrm %%DATADIR%%/avformat @dirrm %%DATADIR%% @dirrm lib/mlt -@dirrm include/mlt/valerie -@dirrm include/mlt/miracle @dirrm include/mlt/framework +@dirrm include/mlt++ @dirrm include/mlt >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906050800.n5580aJF097130>