main/omxplayer: fix rpath

author: Timo Teräs <timo.teras@iki.fi> 2017-11-23 06:33:56 +0000
committer: Timo Teräs <timo.teras@iki.fi> 2017-11-23 06:33:56 +0000
commit: e701f9e4eb3a3a554d6b6cc259991b962a5e7324 (patch)
tree: 1827415b39a081026bf60735b5aa7387dcc3d456
parent: 930ee52dac192d9d3a404820855f8c9cd7a98c56 (diff)
download: alpine_aports-e701f9e4eb3a3a554d6b6cc259991b962a5e7324.tar.bz2
alpine_aports-e701f9e4eb3a3a554d6b6cc259991b962a5e7324.tar.xz
alpine_aports-e701f9e4eb3a3a554d6b6cc259991b962a5e7324.zip
2 files changed, 3 insertions, 3 deletions
diff --git a/main/omxplayer/APKBUILD b/main/omxplayer/APKBUILD
index 4a6625ad1f..0b68a16d73 100644
--- a/main/omxplayer/APKBUILD
+++ b/main/omxplayer/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=omxplayer
 pkgver=0.20161017
 _commitid=2ee17b22a6149a043a2e402580504f282c615373
-pkgrel=0
+pkgrel=1
 pkgdesc="Commandline OMX player for Raspberry Pi"
 url="https://github.com/popcornmix/omxplayer"
 arch="armhf"
@@ -52,7 +52,7 @@ package() {
 sha512sums="75a19d29e037d87b17edfe631590ba8e9035dc3ee8114e0398531f7f5fbfbc2947044ec56290dbeff90bba3e8231590b70270e39fcb2e1a91ca698c69e9aa02c  omxplayer-0.20161017.tar.gz
 c349eea5f7c513a07d82a6cf6467c4d21bcb29c053bc5e39d8f675b1212db9beef0abf5248d50ac5a2f14fda73055786f94f421377ffcf5f6bcf8daa2f1b56e8  issue-260.patch
 2a8a6def1e09f726cba58c0b9109fa6c4fbd4a3b4f1d27d200488f262a0e0978579d83db7fe24f1d3e03beef318c3674ed79cbd2f1994c4551a59c9fe0f63489  issue-297.patch
-cafed2aed228e56eb0edeae73cb6d5590c0d94aadbd46317827943f0aef41a0f4950edb2ee1a4749a4f48873d27bf34288ad45101ce6323aeedb59a0acb0c593  fix-makefile.patch
+009ae8398755417d1a13ed15bcfdc6ce43fb637db153c51c15b00ef0edf82117dfb2964d5e37e0baf30e4ef1e3003546ae39e42a492e75fcdfc15d751e1ad516  fix-makefile.patch
 8aa58aaa07453186302dc68d92f28c1b50bf0f8fccd50359640a7fc8339b233b32a0c8c02284a9974599e56d69cc557acc25e76e6438c6d64d15afd9c1788a8e  default-font.patch
 3ddd32235d87a46478d0237ee9b253edeb75729e377b09a33069ecdca2ee230d2851f308897ee75ff69a9f3bdd2876f490bc1667a572dce1c186f80fddcf6df3  omxplayer.initd
 4f906ada035869a0e515e7615056b18b0f6906ce4b3a2d34081c0efa79bb9455380f729e7c5270180f5ace89c53a7ac7c93f609e6761825f639f44aa22346bb2  omxplayer.confd"
diff --git a/main/omxplayer/fix-makefile.patch b/main/omxplayer/fix-makefile.patch
index e739190f2d..88dd8d376f 100644
--- a/main/omxplayer/fix-makefile.patch
+++ b/main/omxplayer/fix-makefile.patch
@@ -4,7 +4,7 @@
 
 LDFLAGS=-L$(SDKSTAGE)/opt/vc/lib/
 LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
-+LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/
+LDFLAGS+=-L./ -Wl,-rpath,/opt/vc/lib/
 +LIBS+=-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 -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads
author	Timo Teräs <timo.teras@iki.fi>	2017-11-23 06:33:56 +0000
committer	Timo Teräs <timo.teras@iki.fi>	2017-11-23 06:33:56 +0000
commit	e701f9e4eb3a3a554d6b6cc259991b962a5e7324 (patch)
tree	1827415b39a081026bf60735b5aa7387dcc3d456
parent	930ee52dac192d9d3a404820855f8c9cd7a98c56 (diff)
download	alpine_aports-e701f9e4eb3a3a554d6b6cc259991b962a5e7324.tar.bz2 alpine_aports-e701f9e4eb3a3a554d6b6cc259991b962a5e7324.tar.xz alpine_aports-e701f9e4eb3a3a554d6b6cc259991b962a5e7324.zip

diff --git a/main/omxplayer/APKBUILD b/main/omxplayer/APKBUILD index 4a6625ad1f..0b68a16d73 100644 --- a/main/omxplayer/APKBUILD +++ b/main/omxplayer/APKBUILD
@@ -2,7 +2,7 @@
2	pkgname=omxplayer	2	pkgname=omxplayer
3	pkgver=0.20161017	3	pkgver=0.20161017
4	_commitid=2ee17b22a6149a043a2e402580504f282c615373	4	_commitid=2ee17b22a6149a043a2e402580504f282c615373
5	pkgrel=0	5	pkgrel=1
6	pkgdesc="Commandline OMX player for Raspberry Pi"	6	pkgdesc="Commandline OMX player for Raspberry Pi"
7	url="https://github.com/popcornmix/omxplayer"	7	url="https://github.com/popcornmix/omxplayer"
8	arch="armhf"	8	arch="armhf"
@@ -52,7 +52,7 @@ package() {
52	sha512sums="75a19d29e037d87b17edfe631590ba8e9035dc3ee8114e0398531f7f5fbfbc2947044ec56290dbeff90bba3e8231590b70270e39fcb2e1a91ca698c69e9aa02c omxplayer-0.20161017.tar.gz	52	sha512sums="75a19d29e037d87b17edfe631590ba8e9035dc3ee8114e0398531f7f5fbfbc2947044ec56290dbeff90bba3e8231590b70270e39fcb2e1a91ca698c69e9aa02c omxplayer-0.20161017.tar.gz
53	c349eea5f7c513a07d82a6cf6467c4d21bcb29c053bc5e39d8f675b1212db9beef0abf5248d50ac5a2f14fda73055786f94f421377ffcf5f6bcf8daa2f1b56e8 issue-260.patch	53	c349eea5f7c513a07d82a6cf6467c4d21bcb29c053bc5e39d8f675b1212db9beef0abf5248d50ac5a2f14fda73055786f94f421377ffcf5f6bcf8daa2f1b56e8 issue-260.patch
54	2a8a6def1e09f726cba58c0b9109fa6c4fbd4a3b4f1d27d200488f262a0e0978579d83db7fe24f1d3e03beef318c3674ed79cbd2f1994c4551a59c9fe0f63489 issue-297.patch	54	2a8a6def1e09f726cba58c0b9109fa6c4fbd4a3b4f1d27d200488f262a0e0978579d83db7fe24f1d3e03beef318c3674ed79cbd2f1994c4551a59c9fe0f63489 issue-297.patch
55	cafed2aed228e56eb0edeae73cb6d5590c0d94aadbd46317827943f0aef41a0f4950edb2ee1a4749a4f48873d27bf34288ad45101ce6323aeedb59a0acb0c593 fix-makefile.patch	55	009ae8398755417d1a13ed15bcfdc6ce43fb637db153c51c15b00ef0edf82117dfb2964d5e37e0baf30e4ef1e3003546ae39e42a492e75fcdfc15d751e1ad516 fix-makefile.patch
56	8aa58aaa07453186302dc68d92f28c1b50bf0f8fccd50359640a7fc8339b233b32a0c8c02284a9974599e56d69cc557acc25e76e6438c6d64d15afd9c1788a8e default-font.patch	56	8aa58aaa07453186302dc68d92f28c1b50bf0f8fccd50359640a7fc8339b233b32a0c8c02284a9974599e56d69cc557acc25e76e6438c6d64d15afd9c1788a8e default-font.patch
57	3ddd32235d87a46478d0237ee9b253edeb75729e377b09a33069ecdca2ee230d2851f308897ee75ff69a9f3bdd2876f490bc1667a572dce1c186f80fddcf6df3 omxplayer.initd	57	3ddd32235d87a46478d0237ee9b253edeb75729e377b09a33069ecdca2ee230d2851f308897ee75ff69a9f3bdd2876f490bc1667a572dce1c186f80fddcf6df3 omxplayer.initd
58	4f906ada035869a0e515e7615056b18b0f6906ce4b3a2d34081c0efa79bb9455380f729e7c5270180f5ace89c53a7ac7c93f609e6761825f639f44aa22346bb2 omxplayer.confd"	58	4f906ada035869a0e515e7615056b18b0f6906ce4b3a2d34081c0efa79bb9455380f729e7c5270180f5ace89c53a7ac7c93f609e6761825f639f44aa22346bb2 omxplayer.confd"


diff --git a/main/omxplayer/fix-makefile.patch b/main/omxplayer/fix-makefile.patch index e739190f2d..88dd8d376f 100644 --- a/main/omxplayer/fix-makefile.patch +++ b/main/omxplayer/fix-makefile.patch
@@ -4,7 +4,7 @@
4		4
5	LDFLAGS=-L$(SDKSTAGE)/opt/vc/lib/	5	LDFLAGS=-L$(SDKSTAGE)/opt/vc/lib/
6	LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound	6	LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
7	+LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/	7	+LDFLAGS+=-L./ -Wl,-rpath,/opt/vc/lib/
8	+LIBS+=-lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound	8	+LIBS+=-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 -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads	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 -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads