Date: Fri, 13 Jan 2017 14:05:39 +0000 (UTC) From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431375 - in head/multimedia/omxplayer: . files Message-ID: <201701131405.v0DE5dbq088653@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cpm Date: Fri Jan 13 14:05:38 2017 New Revision: 431375 URL: https://svnweb.freebsd.org/changeset/ports/431375 Log: multimedia/omxplayer: update to 20161004 - Add LICENSE_FILE - Fix build with ffmpeg 3.x - Drop USE_GCC - Honor LOCALBASE in patch-omxplayer.cpp PR: 215849 Submitted by: Mikael Urankar <mikael.urankar@gmail.com> (maintainer) Added: head/multimedia/omxplayer/files/patch-utils_variant-impl.hpp (contents, props changed) Modified: head/multimedia/omxplayer/Makefile head/multimedia/omxplayer/distinfo head/multimedia/omxplayer/files/patch-Makefile head/multimedia/omxplayer/files/patch-Makefile.include head/multimedia/omxplayer/files/patch-omxplayer.cpp Modified: head/multimedia/omxplayer/Makefile ============================================================================== --- head/multimedia/omxplayer/Makefile Fri Jan 13 13:52:36 2017 (r431374) +++ head/multimedia/omxplayer/Makefile Fri Jan 13 14:05:38 2017 (r431375) @@ -2,16 +2,17 @@ # $FreeBSD$ PORTNAME= omxplayer -PORTVERSION= 20151109 -PORTREVISION= 4 +PORTVERSION= 20161004 CATEGORIES= multimedia MAINTAINER= mikael.urankar@gmail.com COMMENT= Raspberry Pi video player LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ +LIB_DEPENDS= libasound.so:audio/alsa-lib \ + libboost_thread.so:devel/boost-libs \ libdbus-1.so:devel/dbus \ libpcre.so:devel/pcre \ libEGL.so:misc/raspberrypi-userland \ @@ -27,10 +28,9 @@ ALL_TARGET= omxplayer.bin USE_GITHUB= yes GH_ACCOUNT= popcornmix -GH_TAGNAME= 6f073c9 +GH_TAGNAME= 12b472e USES= gmake shebangfix -USE_GCC= yes SHEBANG_FILES= omxplayer PLIST_FILES= bin/omxplayer bin/omxplayer.bin Modified: head/multimedia/omxplayer/distinfo ============================================================================== --- head/multimedia/omxplayer/distinfo Fri Jan 13 13:52:36 2017 (r431374) +++ head/multimedia/omxplayer/distinfo Fri Jan 13 14:05:38 2017 (r431375) @@ -1,2 +1,3 @@ -SHA256 (popcornmix-omxplayer-20151109-6f073c9_GH0.tar.gz) = a88723f7f854386b53fb601b4f57cbad33a702556de83122661cc6cd5d877ff2 -SIZE (popcornmix-omxplayer-20151109-6f073c9_GH0.tar.gz) = 1203829 +TIMESTAMP = 1483038468 +SHA256 (popcornmix-omxplayer-20161004-12b472e_GH0.tar.gz) = 8aabcc8a1665686dfb72e74b30b6f755a72b5e5577e235dad6c1c6d28dc79637 +SIZE (popcornmix-omxplayer-20161004-12b472e_GH0.tar.gz) = 1218679 Modified: head/multimedia/omxplayer/files/patch-Makefile ============================================================================== --- head/multimedia/omxplayer/files/patch-Makefile Fri Jan 13 13:52:36 2017 (r431374) +++ head/multimedia/omxplayer/files/patch-Makefile Fri Jan 13 14:05:38 2017 (r431375) @@ -1,26 +1,26 @@ ---- Makefile.orig 2015-10-24 12:09:14 UTC +--- Makefile.orig 2016-09-14 UTC +++ Makefile @@ -2,9 +2,9 @@ include Makefile.include CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST --LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -+LDFLAGS+=-L./ -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz +-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound ++LDFLAGS+=-L./ -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include +INCLUDES+=-I./ -Ilinux -I$(LOCALBASE)/include/dbus-1.0 -I$(LOCALBASE)/include/dbus-1.0/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/ffmpeg DIST ?= omxplayer-dist -@@ -48,11 +48,10 @@ all: dist +@@ -49,11 +49,10 @@ all: dist omxplayer.o: help.h keys.h version: - bash gen_version.sh > version.h -+ sh gen_version.sh > version.h ++ sh gen_version.sh > version.h omxplayer.bin: version $(OBJS) -- $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre +- $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre - $(STRIP) omxplayer.bin + $(CXX) $(CFLAGS) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lthr -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre Modified: head/multimedia/omxplayer/files/patch-Makefile.include ============================================================================== --- head/multimedia/omxplayer/files/patch-Makefile.include Fri Jan 13 13:52:36 2017 (r431374) +++ head/multimedia/omxplayer/files/patch-Makefile.include Fri Jan 13 14:05:38 2017 (r431375) @@ -1,6 +1,6 @@ ---- Makefile.include.orig 2015-10-24 12:09:14 UTC +--- Makefile.include.orig 2017-01-03 14:55:21 UTC +++ Makefile.include -@@ -1,40 +1,7 @@ +@@ -1,40 +1,3 @@ -USE_BUILDROOT=0 -FLOAT=hard - @@ -34,14 +34,13 @@ -RANLIB := $(TOOLCHAIN)/bin/$(HOST)-ranlib -STRIP := $(TOOLCHAIN)/bin/$(HOST)-strip -AR := $(TOOLCHAIN)/bin/$(HOST)-ar -+LDFLAGS := -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/ffmpeg - CXXCP := $(CXX) -E +-CXXCP := $(CXX) -E -PATH := $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH) -+STRIP := strip -+FLOAT := softfp - - CFLAGS += -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog +- +-CFLAGS += -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog -LDFLAGS += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build -#INCLUDES += -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2 -INCLUDES += -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include ++CFLAGS += -fomit-frame-pointer ++LDFLAGS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/ffmpeg +INCLUDES += -I$(LOCALBASE)/include -I$(LOCALBASE)/include/interface/vcos/pthreads -I$(LOCALBASE)/include/interface/vmcs_host/linux -I$(LOCALBASE)/lib/dbus-1.0/include Modified: head/multimedia/omxplayer/files/patch-omxplayer.cpp ============================================================================== --- head/multimedia/omxplayer/files/patch-omxplayer.cpp Fri Jan 13 13:52:36 2017 (r431374) +++ head/multimedia/omxplayer/files/patch-omxplayer.cpp Fri Jan 13 14:05:38 2017 (r431375) @@ -6,8 +6,8 @@ bool m_has_external_subtitles = false; -std::string m_font_path = "/usr/share/fonts/truetype/freefont/FreeSans.ttf"; -std::string m_italic_font_path = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf"; -+std::string m_font_path = "/usr/local/share/fonts/freefont-ttf/FreeSans.ttf"; -+std::string m_italic_font_path = "/usr/local/share/fonts/freefont-ttf/FreeSansOblique.ttf"; ++std::string m_font_path = "LOCALBASE/share/fonts/freefont-ttf/FreeSans.ttf"; ++std::string m_italic_font_path = "LOCALBASE/share/fonts/freefont-ttf/FreeSansOblique.ttf"; std::string m_dbus_name = "org.mpris.MediaPlayer2.omxplayer"; bool m_asked_for_font = false; bool m_asked_for_italic_font = false; Added: head/multimedia/omxplayer/files/patch-utils_variant-impl.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/omxplayer/files/patch-utils_variant-impl.hpp Fri Jan 13 14:05:38 2017 (r431375) @@ -0,0 +1,27 @@ +--- utils/variant-impl.hpp.orig 2017-01-02 19:30:30 UTC ++++ utils/variant-impl.hpp +@@ -306,12 +306,12 @@ struct get_index<From, Checker, T, Rest. + + static const bool is_exact_match = is_same_upto_cv<T, From>(); + static const bool is_relaxed_match = relaxed_same<T, From>(); +- static const bool is_variant = is_variant<T>::value; ++ static const bool is_variant_match = is_variant<T>::value; + static const bool is_ud_match = Checker<T, From>::value; +- static const bool is_strict_ud_match = is_ud_match && !is_variant; ++ static const bool is_strict_ud_match = is_ud_match && !is_variant_match; + + typedef typename get_index_of_variant<From, T>::type variant_indices; +- static const int var_quality = is_variant ? variant_indices::quality - 2 : 0; ++ static const int var_quality = is_variant_match ? variant_indices::quality - 2 : 0; + + // Match quality: + // exact > su > rel > strict_ud > ud +@@ -335,7 +335,7 @@ struct get_index<From, Checker, T, Rest. + sizeof...(Rest)+1, typeid(From).name(), typeid(T).name(), + local_quality, var_quality, Tail::quality, quality, index, ambiguous); + +- if (is_variant) ++ if (is_variant_match) + { + printf("<< var <<\n"); + variant_indices::debug();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701131405.v0DE5dbq088653>