From nobody Fri May 06 05:44:04 2022 X-Original-To: dev-commits-ports-main@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 A0C331AC1173; Fri, 6 May 2022 05:44:04 +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 4KvfdJ40S4z3lP8; Fri, 6 May 2022 05:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651815844; 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=Zi3yjkUbjD05hb/i9E0Z3Zr5paPd+oOstDoNOrnyNU4=; b=GqzQWa0270O4AHNGu8d1gNzQRTbnM6olnd/o3bnVGDCjt1TE70Xcneowm/gnlxWVyiaDBF fFsVTnmoPVYJkFK5OM6O3F4wH4P4SvDXF1zd1Jj8k2eQ00VNOLnFF+ZGBo0IkPjSoVAB47 fgQNkMIuTFZflQ1Mu9RYuMDb0pS5Fntg7LL6URO2Ro8aHjLD3kqVB0a2F2az/g+7gqo8LH RS+9r6URM31S/Dc3saBJlX4D1/UQSeRF8GbLi8cvbihjF3l8VSlERU2HHJA0HreaoVQG5m JNVuP2Br25HGKIwedURMCaKXA3o46nF53omyvV9zeQsaLXiDCBf3Z1H9xG2qFg== 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 6AA24161AC; Fri, 6 May 2022 05:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2465i4sx040878; Fri, 6 May 2022 05:44:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2465i4iH040877; Fri, 6 May 2022 05:44:04 GMT (envelope-from git) Date: Fri, 6 May 2022 05:44:04 GMT Message-Id: <202205060544.2465i4iH040877@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Lo=C3=AFc Bartoletti?= Subject: git: 06ba562579f8 - main - multimedia/lebiniou: fix build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lbartoletti X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06ba562579f8b627b7bb8fdafc8a3ad422577648 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651815844; 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=Zi3yjkUbjD05hb/i9E0Z3Zr5paPd+oOstDoNOrnyNU4=; b=cdwPzFpJIYrP1StSLYMfulfb+7kd2v6/9+rOdPmhIeuCDIxyHl7hvpvpgV1oWKRnv5ctfG wVzRltz3hv9PGxczKom1GyD1uf+sEBM+xwXkpdJ1/cmTq21p/4DKPh5n5g3mX174S5remg drDbvWK3CxpdWyVQmVsidKfmhZigeo/Aho3RZnZ0zyrMZZsFY320dHII1T6T7PaRb0yur3 8vjF1JAUFPS/2AqSpD0BlAWShD1T95XPjRHbspY3dwXLZ6V0X7ry8hCSpk+79UVTNw3z0X a1LrWRtu/uccyfi7L5vdk8bGOwjPpc8uOb9MWx5zbllhcgmb5RwZA7NKgjzLkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651815844; a=rsa-sha256; cv=none; b=RnNbDU2EHtcWaVmgJIv1QjAXFQUf3DojY1ckAW1YEGaOjfUE9WXL9FawAwpsJKjLg/at+0 sFcIofvOIaFA8Y3lxmyhRQWUgzn/GUAU0RJ438Ne9mefumRTuNoxMs1Qbbaw7WBfnaMKO8 ImTVzR3yJFkgtzWsQsGdnQp7gIWF0PquL1E4cOzEhAQcBGtUgLh2QPqceyvvg8JzQ3kF5u 6NY03k9ed1EfaWsNKnF32C+EHuzSCvUtMSlDTuUAIHW+onGTTfjmdKHFSEyVYLzaKJhkTs nR8KdHEsRKEINwD670bW+HtsBT9/N8fGElm0yV8Pir/jhzwCyRz/WYzh6/PaaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=06ba562579f8b627b7bb8fdafc8a3ad422577648 commit 06ba562579f8b627b7bb8fdafc8a3ad422577648 Author: Loïc Bartoletti AuthorDate: 2022-05-05 04:43:45 +0000 Commit: Loïc Bartoletti CommitDate: 2022-05-06 05:43:31 +0000 multimedia/lebiniou: fix build multimedia/lebiniou uses -Werror flag and raises errors in ImageMagick6: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers] Removing the 'const' on different files, fix the build of multimedia/lebiniou. --- graphics/ImageMagick6/Makefile | 1 + graphics/ImageMagick6/files/patch-magick_log.c | 38 ++++++++++ graphics/ImageMagick6/files/patch-magick_log.h | 20 ++++++ .../files/patch-magick_pixel-accessor.h | 80 ++++++++++++++++++++++ multimedia/lebiniou/Makefile | 1 + 5 files changed, 140 insertions(+) diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile index f13cbdb9bdd3..163fd4be0a48 100644 --- a/graphics/ImageMagick6/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -1,5 +1,6 @@ PORTNAME= ImageMagick DISTVERSION= 6.9.12-47 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= https://www.imagemagick.org/download/ \ diff --git a/graphics/ImageMagick6/files/patch-magick_log.c b/graphics/ImageMagick6/files/patch-magick_log.c new file mode 100644 index 000000000000..932050f2905b --- /dev/null +++ b/graphics/ImageMagick6/files/patch-magick_log.c @@ -0,0 +1,38 @@ +--- magick/log.c.orig 2022-05-05 04:09:18 UTC ++++ magick/log.c +@@ -394,7 +394,7 @@ MagickExport void CloseMagickLog(void) + % const char *GetLogEventMask(void) + % + */ +-MagickExport const LogEventType GetLogEventMask(void) ++MagickExport LogEventType GetLogEventMask(void) + { + ExceptionInfo + *exception; +@@ -515,7 +515,7 @@ static int LogInfoCompare(const void *x,const void *y) + } + #endif + +-MagickExport const LogInfo **GetLogInfoList(const char *pattern, ++MagickExport LogInfo **GetLogInfoList(const char *pattern, + size_t *number_preferences,ExceptionInfo *exception) + { + const LogInfo +@@ -674,7 +674,7 @@ MagickExport char **GetLogList(const char *pattern, + % const char *GetLogName(void) + % + */ +-MagickExport const char *GetLogName(void) ++MagickExport char *GetLogName(void) + { + return(log_name); + } +@@ -1930,7 +1930,7 @@ MagickExport void SetLogMethod(MagickLogMethod method) + % o name: Specifies the new client name. + % + */ +-MagickExport const char *SetLogName(const char *name) ++MagickExport char *SetLogName(const char *name) + { + if ((name != (char *) NULL) && (*name != '\0')) + (void) CopyMagickString(log_name,name,MaxTextExtent); diff --git a/graphics/ImageMagick6/files/patch-magick_log.h b/graphics/ImageMagick6/files/patch-magick_log.h new file mode 100644 index 000000000000..4e34c4d5a40d --- /dev/null +++ b/graphics/ImageMagick6/files/patch-magick_log.h @@ -0,0 +1,20 @@ +--- magick/log.h.orig 2022-05-05 04:04:28 UTC ++++ magick/log.h +@@ -66,14 +66,14 @@ typedef void + extern MagickExport char + **GetLogList(const char *,size_t *,ExceptionInfo *); + +-extern MagickExport const char ++extern MagickExport char + *GetLogName(void) magick_attribute((__pure__)), + *SetLogName(const char *); + +-extern MagickExport const LogEventType ++extern MagickExport LogEventType + GetLogEventMask(void) magick_attribute((__pure__)); + +-extern MagickExport const LogInfo ++extern MagickExport LogInfo + **GetLogInfoList(const char *,size_t *,ExceptionInfo *); + + extern MagickExport LogEventType diff --git a/graphics/ImageMagick6/files/patch-magick_pixel-accessor.h b/graphics/ImageMagick6/files/patch-magick_pixel-accessor.h new file mode 100644 index 000000000000..47fbc0450532 --- /dev/null +++ b/graphics/ImageMagick6/files/patch-magick_pixel-accessor.h @@ -0,0 +1,80 @@ +--- magick/pixel-accessor.h.orig 2022-05-05 04:22:46 UTC ++++ magick/pixel-accessor.h +@@ -103,12 +103,12 @@ extern "C" { + #define SetPixelYellow(pixel,value) ((pixel)->blue=(Quantum) (value)) + #define SetPixelY(pixel,value) ((pixel)->red=(Quantum) (value)) + +-static inline const MagickRealType AbsolutePixelValue(const MagickRealType x) ++static inline MagickRealType AbsolutePixelValue(const MagickRealType x) + { + return(x < 0.0f ? -x : x); + } + +-static inline const Quantum ClampPixel(const MagickRealType value) ++static inline Quantum ClampPixel(const MagickRealType value) + { + if (value < 0.0f) + return((Quantum) 0); +@@ -121,7 +121,7 @@ static inline const Quantum ClampPixel(const MagickRea + #endif + } + +-static inline const double PerceptibleReciprocal(const double x) ++static inline double PerceptibleReciprocal(const double x) + { + double + sign; +@@ -135,7 +135,7 @@ static inline const double PerceptibleReciprocal(const + return(sign/MagickEpsilon); + } + +-static inline const MagickRealType GetPixelLuma( ++static inline MagickRealType GetPixelLuma( + const Image *magick_restrict image,const PixelPacket *magick_restrict pixel) + { + MagickRealType +@@ -147,7 +147,7 @@ static inline const MagickRealType GetPixelLuma( + return(intensity); + } + +-static inline const MagickRealType GetPixelLuminance( ++static inline MagickRealType GetPixelLuminance( + const Image *magick_restrict image,const PixelPacket *magick_restrict pixel) + { + MagickRealType +@@ -165,7 +165,7 @@ static inline const MagickRealType GetPixelLuminance( + return(intensity); + } + +-static inline const MagickBooleanType IsPixelAtDepth(const Quantum pixel, ++static inline MagickBooleanType IsPixelAtDepth(const Quantum pixel, + const QuantumAny range) + { + Quantum +@@ -183,7 +183,7 @@ static inline const MagickBooleanType IsPixelAtDepth(c + return(pixel == quantum ? MagickTrue : MagickFalse); + } + +-static inline const MagickBooleanType IsPixelGray(const PixelPacket *pixel) ++static inline MagickBooleanType IsPixelGray(const PixelPacket *pixel) + { + MagickRealType + green_blue, +@@ -197,7 +197,7 @@ static inline const MagickBooleanType IsPixelGray(cons + return(MagickFalse); + } + +-static inline const MagickBooleanType IsPixelMonochrome( ++static inline MagickBooleanType IsPixelMonochrome( + const PixelPacket *pixel) + { + MagickRealType +@@ -217,7 +217,7 @@ static inline const MagickBooleanType IsPixelMonochrom + return(MagickFalse); + } + +-static inline const Quantum PixelPacketIntensity(const PixelPacket *pixel) ++static inline Quantum PixelPacketIntensity(const PixelPacket *pixel) + { + MagickRealType + intensity; diff --git a/multimedia/lebiniou/Makefile b/multimedia/lebiniou/Makefile index fdd75169e38c..a4ab22a868fd 100644 --- a/multimedia/lebiniou/Makefile +++ b/multimedia/lebiniou/Makefile @@ -1,5 +1,6 @@ PORTNAME= lebiniou DISTVERSION= 3.66.0 +PORTREVISION= 1 CATEGORIES= multimedia graphics MAINTAINER= olivier@biniou.info