subject:"update multimedia\/mlt 6.6.0"

Re: update multimedia/mlt 6.6.0

2018-04-22 Thread Rafael Sadowski

On Sat Apr 21, 2018 at 12:29:25AM -0500, Matthew Martin wrote:
> Update multimedia/mlt to the latest release. Also fixes the build with
> clang. I don't use melt, but the tests only have one failure (mentioned
> in the Makefile) and it could play a few sample videos. A minor lib bump
> is required, but I'm not confident it's sufficient, so the patch cranks
> the major.
> 

Did you build/run all consumers?

> - Matthew Martin
> 
> 
> diff --git Makefile Makefile
> index f85a35f6c36..65519303346 100644
> --- Makefile
> +++ Makefile
> @@ -2,19 +2,17 @@
>  
>  COMMENT-main =   multimedia transformations framework
>  COMMENT-gpl2 =   GPLv2-licensed modules for mlt
> -VERSION =6.0.0
> +VERSION =6.6.0
>  DISTNAME =   mlt-${VERSION}
>  PKGNAME-main =   ${DISTNAME}
>  PKGNAME-gpl2 =   mlt-gpl2-${VERSION}
> -REVISION-main =  3
> -REVISION-gpl2 =  1
>  
>  # XXX versions should be kept in sync together
> -SHARED_LIBS =mlt 1.1
> -SHARED_LIBS +=   mlt++   1.1
> +SHARED_LIBS =mlt 2.0
> +SHARED_LIBS +=   mlt++   2.0
>  
>  CATEGORIES = multimedia devel
> -HOMEPAGE =   http://www.mltframework.org/
> +HOMEPAGE =   https://www.mltframework.org/
>  
>  MAINTAINER = KDE porting team 

Please CC MAINTAINER in your emails.

>  
> @@ -32,7 +30,7 @@ WANTLIB-gpl2 =  ${COMPILER_LIBCXX} ${MODQT4_WANTLIB} 
> lib/qt4/QtGui
>  WANTLIB-gpl2 += lib/qt4/QtSvg lib/qt4/QtXml lib/qt4/QtOpenGL
>  WANTLIB-gpl2 += X11 exif m mlt mlt++ pthread samplerate
>  
> -MASTER_SITES =   ${MASTER_SITE_SOURCEFORGE:=mlt/}
> +MASTER_SITES =   
> https://github.com/mltframework/mlt/releases/download/v${VERSION}/
>  EXTRACT_SUFX =   .tar.gz
>  
>  MULTI_PACKAGES = -main -gpl2
> diff --git distinfo distinfo
> index 97ca536deaf..b9f40dcf92d 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (mlt-6.0.0.tar.gz) = MXh0z8f8Uo3duzp6Mv1GNyquIr3EUnvhz7Vck/pm470=
> -SIZE (mlt-6.0.0.tar.gz) = 1281478
> +SHA256 (mlt-6.6.0.tar.gz) = KMvFl09y7yKNYkpYgJx8gFU3L19i9YgtwFUJnURLLN0=
> +SIZE (mlt-6.6.0.tar.gz) = 1365768
> diff --git patches/patch-src_framework_Makefile 
> patches/patch-src_framework_Makefile
> index df2402ea8a3..196abbcb6ec 100644
> --- patches/patch-src_framework_Makefile
> +++ patches/patch-src_framework_Makefile
> @@ -1,6 +1,7 @@
>  $OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14 09:15:12 zhuk 
> Exp $
>  src/framework/Makefile.orig  Sun Jun 29 22:23:17 2014
> -+++ src/framework/Makefile   Wed Jul  9 09:43:49 2014
> +Index: src/framework/Makefile
> +--- src/framework/Makefile.orig
>  src/framework/Makefile
>  @@ -1,7 +1,6 @@
>   include ../../config.mak
>   include config.mak
> @@ -19,7 +20,7 @@ $OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14 
> 09:15:12 zhuk Exp $
>   else
>   NAME = libmlt$(LIBSUF)
>   TARGET = $(NAME).$(version)
> -@@ -94,10 +96,12 @@ all: $(TARGET)
> +@@ -96,10 +98,12 @@ all: $(TARGET)
>   
>   $(TARGET): $(OBJS)
>   $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
> @@ -35,7 +36,7 @@ $OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14 
> 09:15:12 zhuk Exp $
>   
>   depend: $(SRCS)
>   $(CC) -MM $(CFLAGS) $^ 1>.depend
> -@@ -114,6 +118,8 @@ install:
> +@@ -116,6 +120,8 @@ install:
>   install -m 755 $(TARGET) $(DESTDIR)$(prefix) ; \
>   install -m 755 $(TARGET) $(DESTDIR)$(libdir)/libmlt.dll ; \
>   install -m 644 libmlt.def $(DESTDIR)$(libdir) ; \
> diff --git patches/patch-src_framework_mlt_property_h 
> patches/patch-src_framework_mlt_property_h
> index 02e8d4d10fe..d93fa11d176 100644
> --- patches/patch-src_framework_mlt_property_h
> +++ patches/patch-src_framework_mlt_property_h
> @@ -3,13 +3,13 @@ $OpenBSD: patch-src_framework_mlt_property_h,v 1.1 
> 2017/05/24 16:30:52 espie Exp
>  Index: src/framework/mlt_property.h
>  --- src/framework/mlt_property.h.orig
>  +++ src/framework/mlt_property.h
> -@@ -30,8 +30,11 @@
> - #include 
> - #endif
> +@@ -32,8 +32,11 @@
>   
> --#if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 
> 900506)
> -+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD_version) 
> && (__FreeBSD_version >= 900506)
> - #include 
> + #if defined(__GLIBC__) && !defined(__APPLE__)
> + #  include 
> +-#elif defined(__APPLE__) || (__FreeBSD_version >= 900506)
> ++#elif defined(__APPLE__) || defined(__FreeBSD_version) && 
> (__FreeBSD_version >= 900506)
> + #  include 
>  +#elif defined(__OpenBSD__)
>  +/* XXX matches __nop_locale glue in libc++ */
>  +typedef void* locale_t;
> diff --git patches/patch-src_modules_plusgpl_consumer_cbrts_c 
> patches/patch-src_modules_plusgpl_consumer_cbrts_c
> index a457a6ca42f..992c32eff07 100644
> --- patches/patch-src_modules_plusgpl_consumer_cbrts_c
> +++ patches/patch-src_m

update multimedia/mlt 6.6.0

2018-04-20 Thread Matthew Martin

Update multimedia/mlt to the latest release. Also fixes the build with
clang. I don't use melt, but the tests only have one failure (mentioned
in the Makefile) and it could play a few sample videos. A minor lib bump
is required, but I'm not confident it's sufficient, so the patch cranks
the major.

- Matthew Martin


diff --git Makefile Makefile
index f85a35f6c36..65519303346 100644
--- Makefile
+++ Makefile
@@ -2,19 +2,17 @@
 
 COMMENT-main = multimedia transformations framework
 COMMENT-gpl2 = GPLv2-licensed modules for mlt
-VERSION =  6.0.0
+VERSION =  6.6.0
 DISTNAME = mlt-${VERSION}
 PKGNAME-main = ${DISTNAME}
 PKGNAME-gpl2 = mlt-gpl2-${VERSION}
-REVISION-main =3
-REVISION-gpl2 =1
 
 # XXX versions should be kept in sync together
-SHARED_LIBS =  mlt 1.1
-SHARED_LIBS += mlt++   1.1
+SHARED_LIBS =  mlt 2.0
+SHARED_LIBS += mlt++   2.0
 
 CATEGORIES =   multimedia devel
-HOMEPAGE = http://www.mltframework.org/
+HOMEPAGE = https://www.mltframework.org/
 
 MAINTAINER =   KDE porting team 
 
@@ -32,7 +30,7 @@ WANTLIB-gpl2 =  ${COMPILER_LIBCXX} ${MODQT4_WANTLIB} 
lib/qt4/QtGui
 WANTLIB-gpl2 += lib/qt4/QtSvg lib/qt4/QtXml lib/qt4/QtOpenGL
 WANTLIB-gpl2 += X11 exif m mlt mlt++ pthread samplerate
 
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mlt/}
+MASTER_SITES = 
https://github.com/mltframework/mlt/releases/download/v${VERSION}/
 EXTRACT_SUFX = .tar.gz
 
 MULTI_PACKAGES =   -main -gpl2
diff --git distinfo distinfo
index 97ca536deaf..b9f40dcf92d 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (mlt-6.0.0.tar.gz) = MXh0z8f8Uo3duzp6Mv1GNyquIr3EUnvhz7Vck/pm470=
-SIZE (mlt-6.0.0.tar.gz) = 1281478
+SHA256 (mlt-6.6.0.tar.gz) = KMvFl09y7yKNYkpYgJx8gFU3L19i9YgtwFUJnURLLN0=
+SIZE (mlt-6.6.0.tar.gz) = 1365768
diff --git patches/patch-src_framework_Makefile 
patches/patch-src_framework_Makefile
index df2402ea8a3..196abbcb6ec 100644
--- patches/patch-src_framework_Makefile
+++ patches/patch-src_framework_Makefile
@@ -1,6 +1,7 @@
 $OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14 09:15:12 zhuk Exp $
 src/framework/Makefile.origSun Jun 29 22:23:17 2014
-+++ src/framework/Makefile Wed Jul  9 09:43:49 2014
+Index: src/framework/Makefile
+--- src/framework/Makefile.orig
 src/framework/Makefile
 @@ -1,7 +1,6 @@
  include ../../config.mak
  include config.mak
@@ -19,7 +20,7 @@ $OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14 
09:15:12 zhuk Exp $
  else
  NAME = libmlt$(LIBSUF)
  TARGET = $(NAME).$(version)
-@@ -94,10 +96,12 @@ all:   $(TARGET)
+@@ -96,10 +98,12 @@ all:   $(TARGET)
  
  $(TARGET): $(OBJS)
$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
@@ -35,7 +36,7 @@ $OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14 
09:15:12 zhuk Exp $
  
  depend:   $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend
-@@ -114,6 +118,8 @@ install:
+@@ -116,6 +120,8 @@ install:
install -m 755 $(TARGET) $(DESTDIR)$(prefix) ; \
install -m 755 $(TARGET) $(DESTDIR)$(libdir)/libmlt.dll ; \
install -m 644 libmlt.def $(DESTDIR)$(libdir) ; \
diff --git patches/patch-src_framework_mlt_property_h 
patches/patch-src_framework_mlt_property_h
index 02e8d4d10fe..d93fa11d176 100644
--- patches/patch-src_framework_mlt_property_h
+++ patches/patch-src_framework_mlt_property_h
@@ -3,13 +3,13 @@ $OpenBSD: patch-src_framework_mlt_property_h,v 1.1 2017/05/24 
16:30:52 espie Exp
 Index: src/framework/mlt_property.h
 --- src/framework/mlt_property.h.orig
 +++ src/framework/mlt_property.h
-@@ -30,8 +30,11 @@
- #include 
- #endif
+@@ -32,8 +32,11 @@
  
--#if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
-+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD_version) && 
(__FreeBSD_version >= 900506)
- #include 
+ #if defined(__GLIBC__) && !defined(__APPLE__)
+ #  include 
+-#elif defined(__APPLE__) || (__FreeBSD_version >= 900506)
++#elif defined(__APPLE__) || defined(__FreeBSD_version) && (__FreeBSD_version 
>= 900506)
+ #  include 
 +#elif defined(__OpenBSD__)
 +/* XXX matches __nop_locale glue in libc++ */
 +typedef void* locale_t;
diff --git patches/patch-src_modules_plusgpl_consumer_cbrts_c 
patches/patch-src_modules_plusgpl_consumer_cbrts_c
index a457a6ca42f..992c32eff07 100644
--- patches/patch-src_modules_plusgpl_consumer_cbrts_c
+++ patches/patch-src_modules_plusgpl_consumer_cbrts_c
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_modules_plusgpl_consumer_cbrts_c,v 1.2 2016/04/03 19:15:23 
zhuk Exp $
 src/modules/plusgpl/consumer_cbrts.c.orig  Thu Feb 18 00:43:24 2016
-+++ src/modules/plusgpl/consumer_cbrts.c   Mon Feb 29 19:34:22 2016
-@@ -251,6 +251,10 @@ static void load_sections( consumer_cbrts self, mlt_pr
+Index: src/modules/plusgpl/consumer_cbrts.c
+--- src/mo

Re: update multimedia/mlt 6.6.0

update multimedia/mlt 6.6.0

2 matches

Site Navigation

Mail list logo

Footer information