Attachment #178596 for bug #215849

View | Details | Raw Unified | Return to bug 215849
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	omxplayer
PORTVERSION=	20161004
PORTREVISION=	3
CATEGORIES=	multimedia

MAINTAINER=	mikael.urankar@gmail.com


LICENSE=	GPLv2

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 \


USE_GITHUB=	yes
GH_ACCOUNT=	popcornmix
GH_TAGNAME=	12b472e

USES=		gmake shebangfix
USE_GCC=	yes
SHEBANG_FILES=	omxplayer

PLIST_FILES=	bin/omxplayer bin/omxplayer.bin

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (popcornmix-omxplayer-20151109-6f073c9_GH0.tar.gz) = a88723f7f854386b53fb601b4f57cbad33a702556de83122661cc6cd5d877ff2	1	TIMESTAMP = 1483038468
2	SIZE (popcornmix-omxplayer-20151109-6f073c9_GH0.tar.gz) = 1203829	2	SHA256 (popcornmix-omxplayer-20161004-12b472e_GH0.tar.gz) = 8aabcc8a1665686dfb72e74b30b6f755a72b5e5577e235dad6c1c6d28dc79637
		3	SIZE (popcornmix-omxplayer-20161004-12b472e_GH0.tar.gz) = 1218679




--- 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 -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
 
@@ -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
 
 omxplayer.bin: version $(OBJS)
-	$(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
 




--- Makefile.include.orig	2017-01-03 14:55:21 UTC
+++ Makefile.include
@@ -1,40 +1,3 @@
-USE_BUILDROOT=0
-FLOAT=hard
-

-RANLIB			:= $(TOOLCHAIN)/bin/$(HOST)-ranlib
-STRIP				:= $(TOOLCHAIN)/bin/$(HOST)-strip
-AR 					:= $(TOOLCHAIN)/bin/$(HOST)-ar
-CXXCP 			:= $(CXX) -E
 CXXCP 			:= $(CXX) -E
-PATH 				:= $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
-
-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

Lines 6-13 Link Here

(-)files/patch-omxplayer.cpp (-2 / +2 lines)
6	bool m_has_external_subtitles = false;	6	bool m_has_external_subtitles = false;
7	-std::string m_font_path = "/usr/share/fonts/truetype/freefont/FreeSans.ttf";	7	-std::string m_font_path = "/usr/share/fonts/truetype/freefont/FreeSans.ttf";
8	-std::string m_italic_font_path = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf";	8	-std::string m_italic_font_path = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf";
9	+std::string m_font_path = "/usr/local/share/fonts/freefont-ttf/FreeSans.ttf";	9	+std::string m_font_path = "LOCALBASE/share/fonts/freefont-ttf/FreeSans.ttf";
10	+std::string m_italic_font_path = "/usr/local/share/fonts/freefont-ttf/FreeSansOblique.ttf";	10	+std::string m_italic_font_path = "LOCALBASE/share/fonts/freefont-ttf/FreeSansOblique.ttf";
11	std::string m_dbus_name = "org.mpris.MediaPlayer2.omxplayer";	11	std::string m_dbus_name = "org.mpris.MediaPlayer2.omxplayer";
12	bool m_asked_for_font = false;	12	bool m_asked_for_font = false;
13	bool m_asked_for_italic_font = false;	13	bool m_asked_for_italic_font = false;




--- 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();

Return to bug 215849

Lines 2-9 Link Here

(-)Makefile (-5 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= omxplayer	4	PORTNAME= omxplayer
5	PORTVERSION= 20151109	5	PORTVERSION= 20161004
6	PORTREVISION= 3
7	CATEGORIES= multimedia	6	CATEGORIES= multimedia
8		7
9	MAINTAINER= mikael.urankar@gmail.com	8	MAINTAINER= mikael.urankar@gmail.com
Lines 11-17 Link Here
11		10
12	LICENSE= GPLv2	11	LICENSE= GPLv2
13		12
14	LIB_DEPENDS= libboost_thread.so:devel/boost-libs \	13	LIB_DEPENDS= libasound.so:audio/alsa-lib \
		14	libboost_thread.so:devel/boost-libs \
15	libdbus-1.so:devel/dbus \	15	libdbus-1.so:devel/dbus \
16	libpcre.so:devel/pcre \	16	libpcre.so:devel/pcre \
17	libEGL.so:misc/raspberrypi-userland \	17	libEGL.so:misc/raspberrypi-userland \
Lines 27-36 Link Here
27		27
28	USE_GITHUB= yes	28	USE_GITHUB= yes
29	GH_ACCOUNT= popcornmix	29	GH_ACCOUNT= popcornmix
30	GH_TAGNAME= 6f073c9	30	GH_TAGNAME= 12b472e
31		31
32	USES= gmake shebangfix	32	USES= gmake shebangfix
33	USE_GCC= yes
34	SHEBANG_FILES= omxplayer	33	SHEBANG_FILES= omxplayer
35		34
36	PLIST_FILES= bin/omxplayer bin/omxplayer.bin	35	PLIST_FILES= bin/omxplayer bin/omxplayer.bin

Lines 1-11 Link Here

(-)files/patch-Makefile (-6 / +6 lines)
1	--- Makefile.orig 2015-10-24 12:09:14 UTC	1	--- Makefile.orig 2016-09-14 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -2,9 +2,9 @@ include Makefile.include	3	@@ -2,9 +2,9 @@ include Makefile.include
4		4
5	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	5	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
6		6
7	-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz	7	-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
8	+LDFLAGS+=-L./ -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz	8	+LDFLAGS+=-L./ -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
9		9
10	-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include	10	-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
11	+INCLUDES+=-I./ -Ilinux -I$(LOCALBASE)/include/dbus-1.0 -I$(LOCALBASE)/include/dbus-1.0/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/ffmpeg	11	+INCLUDES+=-I./ -Ilinux -I$(LOCALBASE)/include/dbus-1.0 -I$(LOCALBASE)/include/dbus-1.0/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/ffmpeg
Lines 12-26 Link Here
12		12
13	DIST ?= omxplayer-dist	13	DIST ?= omxplayer-dist
14		14
15	@@ -48,11 +48,10 @@ all: dist	15	@@ -49,11 +49,10 @@ all: dist
16	omxplayer.o: help.h keys.h	16	omxplayer.o: help.h keys.h
17		17
18	version:	18	version:
19	- bash gen_version.sh > version.h	19	- bash gen_version.sh > version.h
20	+ sh gen_version.sh > version.h	20	+ sh gen_version.sh > version.h
21		21
22	omxplayer.bin: version $(OBJS)	22	omxplayer.bin: version $(OBJS)
23	- $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre	23	- $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
24	- $(STRIP) omxplayer.bin	24	- $(STRIP) omxplayer.bin
25	+ $(CXX) $(CFLAGS) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lthr -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre	25	+ $(CXX) $(CFLAGS) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lthr -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
26		26

Lines 1-6 Link Here

(-)files/patch-Makefile.include (-8 / +7 lines)
1	--- Makefile.include.orig 2015-10-24 12:09:14 UTC	1	--- Makefile.include.orig 2017-01-03 14:55:21 UTC
2	+++ Makefile.include	2	+++ Makefile.include
3	@@ -1,40 +1,7 @@	3	@@ -1,40 +1,3 @@
4	-USE_BUILDROOT=0	4	-USE_BUILDROOT=0
5	-FLOAT=hard	5	-FLOAT=hard
6	-	6	-
Lines 34-47 Link Here
34	-RANLIB := $(TOOLCHAIN)/bin/$(HOST)-ranlib	34	-RANLIB := $(TOOLCHAIN)/bin/$(HOST)-ranlib
35	-STRIP := $(TOOLCHAIN)/bin/$(HOST)-strip	35	-STRIP := $(TOOLCHAIN)/bin/$(HOST)-strip
36	-AR := $(TOOLCHAIN)/bin/$(HOST)-ar	36	-AR := $(TOOLCHAIN)/bin/$(HOST)-ar
37	+LDFLAGS := -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/ffmpeg	37	-CXXCP := $(CXX) -E
38	CXXCP := $(CXX) -E
39	-PATH := $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)	38	-PATH := $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
40	+STRIP := strip	39	-
41	+FLOAT := softfp	40	-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
42
43	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
44	-LDFLAGS += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build	41	-LDFLAGS += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build
45	-#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	42	-#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
46	-INCLUDES += -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include	43	-INCLUDES += -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include
		44	+CFLAGS += -fomit-frame-pointer
		45	+LDFLAGS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/ffmpeg
47	+INCLUDES += -I$(LOCALBASE)/include -I$(LOCALBASE)/include/interface/vcos/pthreads -I$(LOCALBASE)/include/interface/vmcs_host/linux -I$(LOCALBASE)/lib/dbus-1.0/include	46	+INCLUDES += -I$(LOCALBASE)/include -I$(LOCALBASE)/include/interface/vcos/pthreads -I$(LOCALBASE)/include/interface/vmcs_host/linux -I$(LOCALBASE)/lib/dbus-1.0/include

Line 0 Link Here

(-)files/patch-utils_variant-impl.hpp (+27 lines)
	1	--- utils/variant-impl.hpp.orig 2017-01-02 19:30:30 UTC
	2	+++ utils/variant-impl.hpp
	3	@@ -306,12 +306,12 @@ struct get_index<From, Checker, T, Rest.
	4
	5	static const bool is_exact_match = is_same_upto_cv<T, From>();
	6	static const bool is_relaxed_match = relaxed_same<T, From>();
	7	- static const bool is_variant = is_variant<T>::value;
	8	+ static const bool is_variant_match = is_variant<T>::value;
	9	static const bool is_ud_match = Checker<T, From>::value;
	10	- static const bool is_strict_ud_match = is_ud_match && !is_variant;
	11	+ static const bool is_strict_ud_match = is_ud_match && !is_variant_match;
	12
	13	typedef typename get_index_of_variant<From, T>::type variant_indices;
	14	- static const int var_quality = is_variant ? variant_indices::quality - 2 : 0;
	15	+ static const int var_quality = is_variant_match ? variant_indices::quality - 2 : 0;
	16
	17	// Match quality:
	18	// exact > su > rel > strict_ud > ud
	19	@@ -335,7 +335,7 @@ struct get_index<From, Checker, T, Rest.
	20	sizeof...(Rest)+1, typeid(From).name(), typeid(T).name(),
	21	local_quality, var_quality, Tail::quality, quality, index, ambiguous);
	22
	23	- if (is_variant)
	24	+ if (is_variant_match)
	25	{
	26	printf("<< var <<\n");
	27	variant_indices::debug();