From nobody Fri Jun 30 07:20:28 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qsmtj1XPQz4kq6M; Fri, 30 Jun 2023 07:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qsmtj0q6Xz3sHR; Fri, 30 Jun 2023 07:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ai7qs5XEByV1THeVHzAOYq5qZlhK5v3HKpDziZWg0Yw=; b=IEzurU1H5yQW+pUGZ42efqd86m14itKeV5cq0dbvV4BeCwQXV7tfYvmWd+GZd9Opvde6Mu o8LmA2lVB0WfjQtva4xfj6iNOjibbQClfyZHDMqaeqjJJ8+sQ+zm+fZime+01274ylwyzV Nmp9Uovl2HIedBYqIot95p2KBVtWmmAEJ3xt/SLUqYQIHgYo3LjnpsyS1WLF6moGsncDpD rQCBc/SKy64qZZ4ujHe1XlBAnCFra3Jegc3AF2LFJGj4GxuPsgVVd1mAxQmzr+UB8zN+V5 dGm8uVPmHcS6QB+aUo3ebwdUHE3ZjkD8c3OHYICHcZ8ivAst7lBnQHiMfY8nSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ai7qs5XEByV1THeVHzAOYq5qZlhK5v3HKpDziZWg0Yw=; b=Q6heTwOsqaxnDn8Sh3pQAQg1u4VKN8oI2xe+tthwGDHOFkNMUa5FlVWIFKMPFvrJSOxhLe pVxlgaPKdSmqZFQfU6ACh6Zj32tFkNXzLCWtf0RRhtf7nhE8fgmU3g1QeHzt8JvCNPKtZQ jRqfUmRht8qij5iBYbeVzv/0/hXQjeAuqM2K84U2ZP1F/ltMkQ3sR2Wr8ZV8Ct0Fb5GE2C HAHuKHIaQHAO8jQ5EL6CUBTocX8UpTOIrH4F5xs8JNA6qDCW/Mq9JF10TGqK/xsG/pSL8h UJwqy9RSgPSFBcY1qZywI81Py4H8MSZNCb0GKgS9o222cu/+JOq+PLdrDIxgwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688109629; a=rsa-sha256; cv=none; b=OTagSBwMI+7yYG0gte2tesH3l/2VgNwx0u19ghWL2xrlYE3vW75aEBL8h3+KHdvV4kUDEU Jt0hXOr5EoRNbW/lJjvkhRNZoGjhExFO5X/5/l0LW9gY3IhQRzFv7SB3fQeeFCwZvHRIGw B7nbRgaaWwNHjVm5uwgILbfjtH49sp1MjaUM2KPXOMpPo6qCT0zDLengvLgPn5JYKan+2n RHDxZ2sc8Txm96EOgdkKLLyRasPnQuNfmKg88ogmWjL83pc6aDPVOBBntdaDfQY3SdIRiO 97VGhIAr+H5DVjsmeT1iA/IaZoIqQDVKADOVfxSA9n9im55tVpLfWY+X/Rd6Zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qsmth6dMtzqCJ; Fri, 30 Jun 2023 07:20:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35U7KSVs075748; Fri, 30 Jun 2023 07:20:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U7KStD075747; Fri, 30 Jun 2023 07:20:28 GMT (envelope-from git) Date: Fri, 30 Jun 2023 07:20:28 GMT Message-Id: <202306300720.35U7KStD075747@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 9b6337dcf5c6 - main - graphics/py-ming: Fix build with Clang 15 and remove the workaround List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b6337dcf5c6d77c50cef7972d180cff06c2cac6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b6337dcf5c6d77c50cef7972d180cff06c2cac6 commit 9b6337dcf5c6d77c50cef7972d180cff06c2cac6 Author: Po-Chuan Hsieh AuthorDate: 2023-06-30 07:04:07 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-30 07:04:07 +0000 graphics/py-ming: Fix build with Clang 15 and remove the workaround - Update WWW ./ming_wrap.c:2427:18: error: incompatible integer to pointer conversion assigning to 'void *' from 'int' [-Wint-conversion] type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./ming_wrap.c:2497:13: error: incompatible integer to pointer conversion initializing 'PyObject *' (aka 'struct _object *') with an expression of type 'int' [-Wint-conversion] PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./ming_wrap.c:2525:11: error: incompatible integer to pointer conversion assigning to 'PyObject *' (aka 'struct _object *') from 'int' [-Wint-conversion] obj = PyCObject_FromVoidPtr(descriptor, NULL); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./ming_wrap.c:3886:10: error: incompatible integer to pointer conversion assigning to 'FILE *' (aka 'struct __sFILE *') from 'int' [-Wint-conversion] arg1 = PyFile_AsFile(obj0); ^ ~~~~~~~~~~~~~~~~~~~ ./ming_wrap.c:3908:10: error: incompatible integer to pointer conversion assigning to 'FILE *' (aka 'struct __sFILE *') from 'int' [-Wint-conversion] arg1 = PyFile_AsFile(obj0); ^ ~~~~~~~~~~~~~~~~~~~ ./ming_wrap.c:4302:10: error: incompatible integer to pointer conversion assigning to 'FILE *' (aka 'struct __sFILE *') from 'int' [-Wint-conversion] arg1 = PyFile_AsFile(obj0); ^ ~~~~~~~~~~~~~~~~~~~ ./ming_wrap.c:4352:10: error: incompatible integer to pointer conversion assigning to 'FILE *' (aka 'struct __sFILE *') from 'int' [-Wint-conversion] arg1 = PyFile_AsFile(obj0); ^ ~~~~~~~~~~~~~~~~~~~ ./ming_wrap.c:4404:10: error: incompatible integer to pointer conversion assigning to 'FILE *' (aka 'struct __sFILE *') from 'int' [-Wint-conversion] arg1 = PyFile_AsFile(obj0); ^ ~~~~~~~~~~~~~~~~~~~ ./ming_wrap.c:4411:10: error: incompatible integer to pointer conversion assigning to 'FILE *' (aka 'struct __sFILE *') from 'int' [-Wint-conversion] arg2 = PyFile_AsFile(obj1); ^ ~~~~~~~~~~~~~~~~~~~ ./ming_wrap.c:7255:10: error: incompatible integer to pointer conversion assigning to 'FILE *' (aka 'struct __sFILE *') from 'int' [-Wint-conversion] arg1 = PyFile_AsFile(obj0); ^ ~~~~~~~~~~~~~~~~~~~ ./ming_wrap.c:7398:10: error: incompatible integer to pointer conversion assigning to 'FILE *' (aka 'struct __sFILE *') from 'int' [-Wint-conversion] arg1 = PyFile_AsFile(obj0); ^ ~~~~~~~~~~~~~~~~~~~ ./ming_wrap.c:8855:10: error: incompatible integer to pointer conversion assigning to 'FILE *' (aka 'struct __sFILE *') from 'int' [-Wint-conversion] arg1 = PyFile_AsFile(obj0); ^ ~~~~~~~~~~~~~~~~~~~ 23 warnings and 12 errors generated. --- graphics/py-ming/Makefile | 10 +--- graphics/py-ming/files/patch-clang15 | 109 +++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 8 deletions(-) diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile index d5886de2e6e0..fd7a209a908a 100644 --- a/graphics/py-ming/Makefile +++ b/graphics/py-ming/Makefile @@ -6,7 +6,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Python module for Ming which allows you to create Flash 4/5 movies -WWW= http://www.libming.org/ +WWW= https://github.com/libming/libming LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi @@ -35,12 +35,6 @@ GH_PROJECT= libming PORTSCOUT= limit:^ming- -.include - -.if ${OPSYS} == FreeBSD && ((${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000) || ${OSVERSION} >= 1400079) -CFLAGS+= -Wno-error=int-conversion -.endif - post-patch: @${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' ${WRKSRC}/py_ext/setup.py.in @${LN} -fs ${LOCALBASE}/include/ming ${WRKSRC}/src @@ -48,4 +42,4 @@ post-patch: post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + -.include +.include diff --git a/graphics/py-ming/files/patch-clang15 b/graphics/py-ming/files/patch-clang15 new file mode 100644 index 000000000000..36af33d03ab3 --- /dev/null +++ b/graphics/py-ming/files/patch-clang15 @@ -0,0 +1,109 @@ +--- py_ext/ming_wrap.c.orig 2017-04-07 08:12:56 UTC ++++ py_ext/ming_wrap.c +@@ -2424,7 +2424,7 @@ SWIG_Python_GetModule(void) { + #ifdef SWIG_LINK_RUNTIME + type_pointer = SWIG_ReturnGlobalTypeList((void *)0); + #else +- type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, ++ type_pointer = (void *) PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, + (char*)"type_pointer" SWIG_TYPE_TABLE_NAME); + if (PyErr_Occurred()) { + PyErr_Clear(); +@@ -2494,7 +2494,7 @@ SWIG_Python_SetModule(swig_module_info *swig_module) { + PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, + swig_empty_runtime_method_table); + #endif +- PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); ++ PyObject *pointer = (PyObject *) PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); + if (pointer && module) { + PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer); + } else { +@@ -2522,7 +2522,7 @@ SWIG_Python_TypeQuery(const char *type) + swig_module_info *swig_module = SWIG_Python_GetModule(); + descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type); + if (descriptor) { +- obj = PyCObject_FromVoidPtr(descriptor, NULL); ++ obj = (PyObject *) PyCObject_FromVoidPtr(descriptor, NULL); + PyDict_SetItem(cache, key, obj); + Py_DECREF(obj); + } +@@ -3883,7 +3883,7 @@ SWIGINTERN PyObject *_wrap_newSWFInput_file(PyObject * + PyErr_SetString(PyExc_TypeError, "Need a file!"); + return NULL; + } +- arg1 = PyFile_AsFile(obj0); ++ arg1 = (FILE *) PyFile_AsFile(obj0); + } + result = newSWFInput_file(arg1); + resultobj = SWIG_NewPointerObj((SWFInput *)memcpy((SWFInput *)malloc(sizeof(SWFInput)),&result,sizeof(SWFInput)), SWIGTYPE_p_SWFInput, SWIG_POINTER_OWN | 0 ); +@@ -3905,7 +3905,7 @@ SWIGINTERN PyObject *_wrap_newSWFInput_stream(PyObject + PyErr_SetString(PyExc_TypeError, "Need a file!"); + return NULL; + } +- arg1 = PyFile_AsFile(obj0); ++ arg1 = (FILE *) PyFile_AsFile(obj0); + } + result = newSWFInput_stream(arg1); + resultobj = SWIG_NewPointerObj((SWFInput *)memcpy((SWFInput *)malloc(sizeof(SWFInput)),&result,sizeof(SWFInput)), SWIGTYPE_p_SWFInput, SWIG_POINTER_OWN | 0 ); +@@ -4299,7 +4299,7 @@ SWIGINTERN PyObject *_wrap_newSWFDBLBitmap(PyObject *S + PyErr_SetString(PyExc_TypeError, "Need a file!"); + return NULL; + } +- arg1 = PyFile_AsFile(obj0); ++ arg1 = (FILE *) PyFile_AsFile(obj0); + } + result = newSWFDBLBitmap(arg1); + resultobj = SWIG_NewPointerObj((SWFDBLBitmap *)memcpy((SWFDBLBitmap *)malloc(sizeof(SWFDBLBitmap)),&result,sizeof(SWFDBLBitmap)), SWIGTYPE_p_SWFDBLBitmap, SWIG_POINTER_OWN | 0 ); +@@ -4349,7 +4349,7 @@ SWIGINTERN PyObject *_wrap_newSWFJpegBitmap(PyObject * + PyErr_SetString(PyExc_TypeError, "Need a file!"); + return NULL; + } +- arg1 = PyFile_AsFile(obj0); ++ arg1 = (FILE *) PyFile_AsFile(obj0); + } + result = newSWFJpegBitmap(arg1); + resultobj = SWIG_NewPointerObj((SWFJpegBitmap *)memcpy((SWFJpegBitmap *)malloc(sizeof(SWFJpegBitmap)),&result,sizeof(SWFJpegBitmap)), SWIGTYPE_p_SWFJpegBitmap, SWIG_POINTER_OWN | 0 ); +@@ -4401,14 +4401,14 @@ SWIGINTERN PyObject *_wrap_newSWFJpegWithAlpha(PyObjec + PyErr_SetString(PyExc_TypeError, "Need a file!"); + return NULL; + } +- arg1 = PyFile_AsFile(obj0); ++ arg1 = (FILE *) PyFile_AsFile(obj0); + } + { + if (!PyFile_Check(obj1)) { + PyErr_SetString(PyExc_TypeError, "Need a file!"); + return NULL; + } +- arg2 = PyFile_AsFile(obj1); ++ arg2 = (FILE *) PyFile_AsFile(obj1); + } + result = newSWFJpegWithAlpha(arg1,arg2); + resultobj = SWIG_NewPointerObj((SWFJpegWithAlpha *)memcpy((SWFJpegWithAlpha *)malloc(sizeof(SWFJpegWithAlpha)),&result,sizeof(SWFJpegWithAlpha)), SWIGTYPE_p_SWFJpegWithAlpha, SWIG_POINTER_OWN | 0 ); +@@ -7252,7 +7252,7 @@ SWIGINTERN PyObject *_wrap_newSWFSoundStream(PyObject + PyErr_SetString(PyExc_TypeError, "Need a file!"); + return NULL; + } +- arg1 = PyFile_AsFile(obj0); ++ arg1 = (FILE *) PyFile_AsFile(obj0); + } + result = (SWFSoundStream)newSWFSoundStream(arg1); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0 ); +@@ -7395,7 +7395,7 @@ SWIGINTERN PyObject *_wrap_newSWFSound(PyObject *SWIGU + PyErr_SetString(PyExc_TypeError, "Need a file!"); + return NULL; + } +- arg1 = PyFile_AsFile(obj0); ++ arg1 = (FILE *) PyFile_AsFile(obj0); + } + ecode2 = SWIG_AsVal_unsigned_SS_char(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { +@@ -8852,7 +8852,7 @@ SWIGINTERN PyObject *_wrap_newSWFVideoStream_fromFile( + PyErr_SetString(PyExc_TypeError, "Need a file!"); + return NULL; + } +- arg1 = PyFile_AsFile(obj0); ++ arg1 = (FILE *) PyFile_AsFile(obj0); + } + result = (SWFVideoStream)newSWFVideoStream_fromFile(arg1); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0 );