Merge pull request #2069 from poyraz76/master

fix x264 convert and stream h264
This commit is contained in:
Ertuğrul Erata
2016-07-23 19:18:25 +03:00
committed by GitHub
2 changed files with 11 additions and 2 deletions
+4 -2
View File
@@ -9,7 +9,7 @@ from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
verMAJOR = "0"
verMAJOR = "142"
verMINOR = "0"
staticlibfile = "/usr/lib/libx264.a"
@@ -30,6 +30,7 @@ def setup():
pisitools.dosed("configure", "-lgpac_static", "-lgpac")
# these disables are here to prevent circular deps, especially with ffmpeg
# Not delete --bit-depth=8 \
autotools.rawConfigure("--prefix=/usr \
--enable-pic \
--enable-shared \
@@ -38,6 +39,7 @@ def setup():
--disable-lavf \
--disable-swscale \
--bit-depth=10 \
--bit-depth=8 \
")
def build():
@@ -47,7 +49,7 @@ def install():
autotools.install()
#verMINOR = getMinorVersion()
#pisitools.dosym("libx264.so.%s.%s" % (verMAJOR, verMINOR), "/usr/lib/libx264.so.%s" % verMAJOR)
pisitools.dosym("libx264.so.%s.%s" % (verMAJOR, verMINOR), "/usr/lib/libx264.so.%s" % verMAJOR)
# No static libs
if shelltools.isFile("%s/%s" % (get.installDIR(), staticlibfile)):
+7
View File
@@ -45,6 +45,13 @@
</Package>
<History>
<Update release="4">
<Date>2016-07-22</Date>
<Version>2245.12062016</Version>
<Comment>Fix relase</Comment>
<Name>Ergün Salman/Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-06-13</Date>
<Version>2245.12062016</Version>