haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

gstreamer: fix provides issuesd. fix build.

Browse Source
This commit is contained in:
Gerasim Troeglazov
2017-06-07 21:26:18 +10:00
parent 3f59aa8d24
commit bd02195f3e
2 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
media-libs/gstreamer/gstreamer-0.10.36.recipe
View File

@@ -5,7 +5,7 @@ to complex audio (mixing) and video (non-linear editing) processing."
HOMEPAGE="http://gstreamer.freedesktop.org/"
COPYRIGHT="Erik Walthinsen"
LICENSE="GNU LGPL v2"
REVISION="2"
REVISION="3"
SOURCE_URI="http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$portVersion.tar.xz"
CHECKSUM_SHA256="9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da"
PATCHES="gstreamer-0.10.36.patchset"
@@ -14,13 +14,25 @@ ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
gstreamer$secondaryArchSuffix = $portVersion
lib:libgstreamer$secondaryArchSuffix = $portVersion
lib:libgstbase$secondaryArchSuffix = $portVersion
lib:libgstcheck$secondaryArchSuffix = $portVersion
lib:libgstcontroller$secondaryArchSuffix = $portVersion
lib:libgstdataprotocol$secondaryArchSuffix = $portVersion
lib:libgstnet$secondaryArchSuffix = $portVersion
gstreamer_0.10$secondaryArchSuffix = $portVersion
lib:libgstreamer_0.10$secondaryArchSuffix = $portVersion
lib:libgstbase_0.10$secondaryArchSuffix = $portVersion
lib:libgstcheck_0.10$secondaryArchSuffix = $portVersion
lib:libgstcontroller_0.10$secondaryArchSuffix = $portVersion
lib:libgstdataprotocol_0.10$secondaryArchSuffix = $portVersion
lib:libgstnet_0.10$secondaryArchSuffix = $portVersion
cmd:gst_feedback_0.10$secondaryArchSuffix = $portVersion
cmd:gst_feedback$secondaryArchSuffix = $portVersion
cmd:gst_inspect_0.10$secondaryArchSuffix = $portVersion
cmd:gst_inspect$secondaryArchSuffix = $portVersion
cmd:gst_launch_0.10$secondaryArchSuffix = $portVersion
cmd:gst_launch$secondaryArchSuffix = $portVersion
cmd:gst_typefind_0.10$secondaryArchSuffix = $portVersion
cmd:gst_typefind$secondaryArchSuffix = $portVersion
cmd:gst_xmlinspect_0.10$secondaryArchSuffix = $portVersion
cmd:gst_xmlinspect$secondaryArchSuffix = $portVersion
cmd:gst_xmllaunch_0.10$secondaryArchSuffix = $portVersion
cmd:gst_xmllaunch$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -28,19 +40,21 @@ REQUIRES="
lib:libz$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:liborc_0.4$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
"
PROVIDES_devel="
gstreamer${secondaryArchSuffix}_devel = $portVersion
devel:libgstreamer$secondaryArchSuffix = $portVersion
devel:libgstbase$secondaryArchSuffix = $portVersion
devel:libgstcheck$secondaryArchSuffix = $portVersion
devel:libgstcontroller$secondaryArchSuffix = $portVersion
devel:libgstdataprotocol$secondaryArchSuffix = $portVersion
devel:libgstnet$secondaryArchSuffix = $portVersion
gstreamer_0.10${secondaryArchSuffix}_devel = $portVersion
devel:libgstreamer_0.10$secondaryArchSuffix = $portVersion
devel:libgstbase_0.10$secondaryArchSuffix = $portVersion
devel:libgstcheck_0.10$secondaryArchSuffix = $portVersion
devel:libgstcontroller_0.10$secondaryArchSuffix = $portVersion
devel:libgstdataprotocol_0.10$secondaryArchSuffix = $portVersion
devel:libgstnet_0.10$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
gstreamer$secondaryArchSuffix == $portVersion base
gstreamer_0.10$secondaryArchSuffix == $portVersion base
haiku$secondaryArchSuffix
"
@@ -55,7 +69,6 @@ BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:libtool
cmd:aclocal
cmd:autoconf
cmd:libtoolize$secondaryArchSuffix
@@ -72,7 +85,6 @@ BUILD()
{
runConfigure ./configure --disable-tests --disable-examples \
--disable-failing-tests --disable-nls
find -type f -name '*' -exec sed -i 's/-lpthread/-lroot/g' {} \;
make $jobArgs
}

26
media-libs/gstreamer/patches/gstreamer-0.10.36.patchset
View File

@@ -1,4 +1,4 @@
From e86926d83ecbed962c5b94b21ffd9eca9f15e7c9 Mon Sep 17 00:00:00 2001
From db0e6d10e7b4bb51127a6c53db13a3c55da74a34 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 2 Nov 2015 22:39:22 +0000
Subject: Fix buffer for filesrc coreelement
@@ -18,5 +18,27 @@ index 9356c0f..ffd4479 100644
(guint) __fbufsize (sink->file), buffer_size, mode);
#else
--
2.2.2
2.7.0
From c96dfffed62297fb977629b73aa56b867ae645f2 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 2 Jun 2017 23:09:44 +1000
Subject: Fix for bison3
diff --git a/gst/parse/Makefile.in b/gst/parse/Makefile.in
index 38f56a7..4b4faa7 100644
--- a/gst/parse/Makefile.in
+++ b/gst/parse/Makefile.in
@@ -737,6 +737,7 @@ grammar.tab.c grammar.tab.h: grammar.y
cat grammar.tab_tmp.c >> grammar.tab_tmp2.c && \
rm grammar.tab_tmp.c && \
mv grammar.tab_tmp2.c grammar.tab.c
+ sed -i '/yychar = yylex/s/yylval/yylval, scanner/g' grammar.tab.c
lex.priv_gst_parse_yy.c: parse.l grammar.tab.h
$(AM_V_GEN)$(FLEX_PATH) -Ppriv_gst_parse_yy $^ && \
--
2.7.0