Date: Thursday, November 12, 2020 @ 17:35:00 Author: foutrelis Revision: 752688
archrelease: copy trunk to community-staging-x86_64 Added: ming/repos/community-staging-x86_64/ ming/repos/community-staging-x86_64/PKGBUILD (from rev 752687, ming/trunk/PKGBUILD) ming/repos/community-staging-x86_64/py3.patch (from rev 752687, ming/trunk/py3.patch) -----------+ PKGBUILD | 42 ++++++++++++ py3.patch | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 249 insertions(+) Copied: ming/repos/community-staging-x86_64/PKGBUILD (from rev 752687, ming/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2020-11-12 17:35:00 UTC (rev 752688) @@ -0,0 +1,42 @@ +# Maintainer: Connor Behan <connor.be...@gmail.com> +# Contributor: mar77i <mysatyre at gmail dot com> + +pkgname=ming +pkgver=0.4.8.r68.g04aee523 +pkgrel=2 +pkgdesc="SWF output library" +arch=('x86_64') +url="http://www.libming.net/" +license=('GPL' 'LGPL') +depends=('freetype2' 'libpng' 'flex' 'giflib') +makedepends=('bison' 'pkgconf' 'swig' 'python' 'git') +options=('!emptydirs') +source=(git+https://github.com/libming/libming.git#commit=04aee52363688426eab74f5d6180c149654a6473 py3.patch) +sha256sums=('SKIP' + 'c33000d71c4e7308c6c4b7a3be05087d6b088b86caa841d0e11585c26cbc1e64') + +pkgver() { + cd "$srcdir"/libming + git describe --long | sed 's/^ming-//;s/\([^-]*-g\)/r\1/;s/[-_]/./g' +} + +build() { + cd "$srcdir"/libming + export CFLAGS="$CFLAGS -fcommon" + git apply ../py3.patch + + ./autogen.sh + PYTHON=/usr/bin/python ./configure --prefix=/usr --enable-python + + # Strange that this can fail when we let the Makefile do it + pushd src/actioncompiler + bison -y -p swf4 -b swf4compiler swf4compiler.y + bison -y -p swf5 -b swf5compiler swf5compiler.y + popd + make +} + +package() { + cd "$srcdir"/libming + make DESTDIR="$pkgdir" install +} Copied: ming/repos/community-staging-x86_64/py3.patch (from rev 752687, ming/trunk/py3.patch) =================================================================== --- community-staging-x86_64/py3.patch (rev 0) +++ community-staging-x86_64/py3.patch 2020-11-12 17:35:00 UTC (rev 752688) @@ -0,0 +1,207 @@ +From d59080d266fae60b8c5b28fbcb1696d291d5e419 Mon Sep 17 00:00:00 2001 +From: Connor Behan <connor.be...@gmail.com> +Date: Sat, 12 Sep 2020 03:05:02 +0100 +Subject: [PATCH] Python 3 + +--- + ming.i | 5 +-- + py_ext/ming.py | 92 +++++++++++++++++++++++++------------------------- + 2 files changed, 49 insertions(+), 48 deletions(-) + +diff --git a/ming.i b/ming.i +index 7ebcaa2d..314d15bc 100644 +--- a/ming.i ++++ b/ming.i +@@ -12,11 +12,12 @@ + %} + + %typemap(python,in) FILE * { +- if (!PyFile_Check($input)) { ++ int temp = PyObject_AsFileDescriptor($input); ++ if (temp == -1) { + PyErr_SetString(PyExc_TypeError, "Need a file!"); + return NULL; + } +- $1 = PyFile_AsFile($input); ++ $1 = fdopen(temp, "r"); + } + + %typemap(python,in) char * { +diff --git a/py_ext/ming.py b/py_ext/ming.py +index 1e23649b..f993aa2f 100644 +--- a/py_ext/ming.py ++++ b/py_ext/ming.py +@@ -112,57 +112,57 @@ class SWFFilter(SWFBase): + if type == SWFFILTER_TYPE_DROPSHADOW: + #color, blur, shadow, flags + if not isinstance(arg2, SWFBlur): +- raise AttributeError, "3. parameter has to be SWFBlur" ++ raise AttributeError("3. parameter has to be SWFBlur") + if not isinstance(arg3, SWFShadow): +- raise AttributeError, "4. parameter has to be SWFShadow" ++ raise AttributeError("4. parameter has to be SWFShadow") + self.this = mingc.newDropShadowFilter(arg1, arg2.this, arg3.this, arg4) + elif type == SWFFILTER_TYPE_BLUR: + #blur + if not isinstance(arg1, SWFBlur): +- raise AttributeError, "2. parameter has to be SWFBlur" ++ raise AttributeError("2. parameter has to be SWFBlur") + self.this = mingc.newBlurFilter(arg1.this) + elif type == SWFFILTER_TYPE_GLOW: + #color, blur, strength, flags + if not isinstance(arg2, SWFBlur): +- raise AttributeError, "3. parameter has to be SWFBlur" ++ raise AttributeError("3. parameter has to be SWFBlur") + self.this = mingc.newGlowFilter(arg1, arg2.this, arg3, arg4) +- elif type == SWFFILTER_TYPE_BEVEL: ++ elif type == SWFFILTER_TYPE_BEVEL: + #shadowColor, highlightColor, blur, shadow, flags + if not isinstance(arg3, SWFBlur): +- raise AttributeError, "4. parameter has to be SWFBlur" ++ raise AttributeError("4. parameter has to be SWFBlur") + if not isinstance(arg4, SWFShadow): +- raise AttributeError, "5. parameter has to be SWFShadow" ++ raise AttributeError("5. parameter has to be SWFShadow") + self.this = mingc.newBevelFilte(arg1, arg2, arg3.this, arg4.this, arg5) +- elif type == SWFFILTER_TYPE_GRADIENTGLOW: ++ elif type == SWFFILTER_TYPE_GRADIENTGLOW: + #gradient, blur, shadow, flags + if not isinstance(arg1, SWFGradient): +- raise AttributeError, "2. parameter has to be SWFGradient" ++ raise AttributeError("2. parameter has to be SWFGradient") + if not isinstance(arg2, SWFBlur): +- raise AttributeError, "3. parameter has to be SWFBlur" ++ raise AttributeError("3. parameter has to be SWFBlur") + if not isinstance(arg3, SWFShadow): +- raise AttributeError, "4. parameter has to be SWFShadow" ++ raise AttributeError("4. parameter has to be SWFShadow") + self.this = mingc.newGradienGlowFilter(arg1.this, arg2.this, arg3.this, arg4) + elif type == SWFFILTER_TYPE_COLORMATRIX: + #colormatrix + if not isinstance(arg1, SWFFilterMatrix): +- raise AttributeError, "2. parameter has to be SWFFilterMatrix" ++ raise AttributeError("2. parameter has to be SWFFilterMatrix") + self.this = mingc.newColorMatrixFilter(arg1.this) +- elif type == SWFFILTER_TYPE_CONVOLUTION: ++ elif type == SWFFILTER_TYPE_CONVOLUTION: + #colormatrix, divisor, bias, color, flags + if not isinstance(arg1, SWFFilterMatrix): +- raise AttributeError, "2. parameter has to be SWFFilterMatrix" ++ raise AttributeError("2. parameter has to be SWFFilterMatrix") + self.this = mingc.newConvolutionFilter(arg1.this, arg2, arg3, arg4, arg5) + elif type == SWFFILTER_TYPE_GRADIENTBEVEL: + #gradient, blur, shadow, flags + if not isinstance(arg1, SWFGradient): +- raise AttributeError, "2. parameter has to be SWFGradient" ++ raise AttributeError("2. parameter has to be SWFGradient") + if not isinstance(arg2, SWFBlur): +- raise AttributeError, "3. parameter has to be SWFBlur" ++ raise AttributeError("3. parameter has to be SWFBlur") + if not isinstance(arg3, SWFShadow): +- raise AttributeError, "4. parameter has to be SWFShadow" ++ raise AttributeError("4. parameter has to be SWFShadow") + self.this = mingc.newGradientBevelFilter(arg1.this, arg2.this, arg3.this, arg4) +- else: +- raise AttributeError, "bad filter type to SWFFilter::new" ++ else: ++ raise AttributeError("bad filter type to SWFFilter::new") + + class SWFMatrix(SWFBase): + +@@ -230,7 +230,7 @@ class SWFShape(SWFBase): + return SWFFill(mingc.SWFShape_addBitmapFill(self.this, arg1.this, arg2)) + + else: +- raise AttributeError, "bad argument to SWFShape::addFill" ++ raise AttributeError("bad argument to SWFShape::addFill") + + def setLeftFill(self, fill): + mingc.SWFShape_setLeftFill(self.this, fill) +@@ -455,29 +455,29 @@ class SWFDisplayItem(SWFBase): + mingc.SWFDisplayItem_setMaskLevel(self.this, level) + + def getPositionX(self): +- x = mingc.new_floatp() +- y = mingc.new_floatp() +- mingc.SWFDisplayItem_getPosition(self.this, x, y) +- ret = mingc.floatp_value(x) +- mingc.delete_floatp(x) +- mingc.delete_floatp(y) +- return ret ++ x = mingc.new_floatp() ++ y = mingc.new_floatp() ++ mingc.SWFDisplayItem_getPosition(self.this, x, y) ++ ret = mingc.floatp_value(x) ++ mingc.delete_floatp(x) ++ mingc.delete_floatp(y) ++ return ret + + def getPositionY(self): +- x = mingc.new_floatp() +- y = mingc.new_floatp() +- mingc.SWFDisplayItem_getPosition(self.this, x, y) +- ret = mingc.floatp_value(y) +- mingc.delete_floatp(x) +- mingc.delete_floatp(y) +- return ret ++ x = mingc.new_floatp() ++ y = mingc.new_floatp() ++ mingc.SWFDisplayItem_getPosition(self.this, x, y) ++ ret = mingc.floatp_value(y) ++ mingc.delete_floatp(x) ++ mingc.delete_floatp(y) ++ return ret + + def getRotation(self): + rot = mingc.new_floatp() +- mingc.SWFDisplayItem_getRotation(self.this, rot) +- ret = mingc.floatp_value(rot) +- mingc.delete_floatp(rot) +- return ret ++ mingc.SWFDisplayItem_getRotation(self.this, rot) ++ ret = mingc.floatp_value(rot) ++ mingc.delete_floatp(rot) ++ return ret + + def getScaleX(self): + sx = mingc.new_floatp() +@@ -525,7 +525,7 @@ class SWFDisplayItem(SWFBase): + return SWFMatrix(mingc.SWFDisplayItem_getMatrix(self.this)) + + def setCXform(self, cx): +- mingc.SWFDisplayItem_setCXform(self.this, cx.this); ++ mingc.SWFDisplayItem_setCXform(self.this, cx.this); + + def addFilter(self, filter): + mingc.SWFDisplayItem_addFilter(self.this, filter.this) +@@ -644,7 +644,7 @@ class SWFMovie(SWFBase): + mingc.SWFMovie_writeExports(self.this) + + def assignSymbol(self, character, name): +- mingc.SWFMovie_assignSymbol(self.this, character.this, name) ++ mingc.SWFMovie_assignSymbol(self.this, character.this, name) + + def setNetworkAccess(self, flag): + mingc.SWFMovie_setNetworkAccess(self.this, flag) +@@ -1205,12 +1205,12 @@ SWFVIDEOSTREAM_MODE_MANUAL = mingc.SWFVIDEOSTREAM_MODE_MANUAL + + class SWFVideoStream(SWFBase): + def __init__(self, filename=None): +- if filename is None: +- self.file = 0; +- self.this = mingc.newSWFVideoStream() +- else: +- self.file = open(filename, "rb"); +- self.this = mingc.newSWFVideoStream_fromFile(self.file) ++ if filename is None: ++ self.file = 0; ++ self.this = mingc.newSWFVideoStream() ++ else: ++ self.file = open(filename, "rb"); ++ self.this = mingc.newSWFVideoStream_fromFile(self.file) + def setDimension(self, w, h): + return mingc.SWFVideoStream_setDimension(self.this, w, h) + def getNumFrames(self): +-- +2.21.0 +