mlt: update 6.2.0 -> 6.4.1

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2017-05-15 00:36:00 +02:00
parent aa8a7f60f7
commit 4f22172e71
2 changed files with 5 additions and 102 deletions

View File

@@ -1,92 +0,0 @@
From c7a84e1d7fd3f9aa35c26923ed29443360f8bfce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 1 Sep 2015 22:54:31 +0200
Subject: [PATCH] configure: use pkgconfig to find sdl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
configure | 4 ++--
src/melt/Makefile | 4 ++--
src/modules/sdl/Makefile | 4 ++--
src/modules/sdl/configure | 8 ++------
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index ef3ec8d..be28cbb 100755
--- a/configure
+++ b/configure
@@ -93,9 +93,9 @@ build_config()
case $targetos in
Darwin)
- echo "CFLAGS+=-fPIC `sdl-config --cflags`"
+ echo "CFLAGS+=-fPIC `pkg-config --cflags sdl`"
echo "SHFLAGS=-dynamiclib"
- echo "LDFLAGS+=`sdl-config --libs`"
+ echo "LDFLAGS+=`pkg-config --libs sdl`"
;;
Linux|GNU/kFreeBSD|GNU)
[ "$optimisations" = "true" ] &&
diff --git a/src/melt/Makefile b/src/melt/Makefile
index b2ea3ed..76a14fb 100644
--- a/src/melt/Makefile
+++ b/src/melt/Makefile
@@ -11,8 +11,8 @@ SRCS := $(OBJS:.o=.c)
ifeq ($(targetos), MinGW)
ifeq (, $(findstring MELT_NOSDL, $(CFLAGS)))
-CFLAGS += $(shell sdl-config --cflags)
-LDFLAGS += $(shell sdl-config --libs)
+CFLAGS += $(shell pkg-config --cflags sdl)
+LDFLAGS += $(shell pkg-config --libs sdl)
endif
bindir = $(prefix)
endif
diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile
index 6919264..dad1b5e 100644
--- a/src/modules/sdl/Makefile
+++ b/src/modules/sdl/Makefile
@@ -21,9 +21,9 @@ else ifneq ($(targetos), MinGW)
LDFLAGS += -lX11
endif
-CFLAGS += $(shell sdl-config --cflags)
+CFLAGS += $(shell pkg-config --cflags sdl)
-LDFLAGS += $(shell sdl-config --libs)
+LDFLAGS += $(shell pkg-config --libs sdl)
ifeq ($(WITH_SDL_IMAGE),1)
OBJS += producer_sdl_image.o
diff --git a/src/modules/sdl/configure b/src/modules/sdl/configure
index 43b90d9..2377776 100755
--- a/src/modules/sdl/configure
+++ b/src/modules/sdl/configure
@@ -3,17 +3,13 @@
if [ "$help" != "1" ]
then
- sdl-config --version > /dev/null 2>&1
+ pkg-config --modversion sdl > /dev/null 2>&1
disable_sdl=$?
if [ "$disable_sdl" = "0" ]
then
echo > config.mak
- image=`sdl-config --prefix`/include/SDL/SDL_image.h
- if [ -f "$image" ]
- then
- echo "WITH_SDL_IMAGE=1" >> config.mak
- fi
+ echo "WITH_SDL_IMAGE=1" >> config.mak
else
echo "- sdl development libs not found: disabling"
touch ../disable-sdl
--
2.1.0

View File

@@ -2,8 +2,8 @@ SUMMARY = "MLT Multimedia Framework"
HOMEPAGE = "http://www.mltframework.org"
LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=dcf3c825659e82539645da41a7908589 \
file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d \
file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
"
@@ -23,14 +23,9 @@ DEPENDS = " \
ladspa-sdk \
"
# TBD sox not found due to missing pkgconfig / others - see log.do_configure
SRC_URI = " \
https://github.com/mltframework/${BPN}/archive/v${PV}.tar.gz \
file://0001-configure-use-pkgconfig-to-find-sdl.patch \
"
SRC_URI[md5sum] = "a1c70e535c61dd9242ac9f6ae58899d0"
SRC_URI[sha256sum] = "dd2ee742e89620de78a259790f92a7cadad67f0e0a6c1ea7ed932f96fb739fff"
SRC_URI = "https://github.com/mltframework/${BPN}/archive/v${PV}.tar.gz"
SRC_URI[md5sum] = "e9f0584739369c40b8f91f8cf50ea3ea"
SRC_URI[sha256sum] = "87583af552695b2235f4ee3fc1e645d69e31702b109331d7e8785fb180cfa382"
inherit autotools-brokensep pkgconfig