X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by lists.alpinelinux.org (Postfix) with ESMTP id 16AFE5C5B6F for ; Sat, 1 Dec 2018 14:21:54 +0000 (GMT) Received: by mail-wm1-f51.google.com with SMTP id z18so1614553wmc.4 for ; Sat, 01 Dec 2018 06:21:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ka/r1ARHAretBEN98Qt5zaqAz6lgyo2D5ccRG93/97E=; b=fWiwDKDRgPoDAxLLm2EWhiM820DANRfH5H8aBrdfIu2uXKx93QBCC+EckzVmlkxsUh VUmkRtw/eUWB6WN1uQ6Yq2MCg4QnVlHTV4iYfOTdifk+GVnZYmcsaR0SFJw92EtvacB1 yGZt0sG4TTm5bGE0mHevMbVxMJyehf7QPvAL8KBmmhW4O8OJZC28ZnmZNiBBw9S8lG9j fIyvAEJ1uSGikxLVLPOy3/V1F/BajqodrdAHMtfngrcNQ5tfKkJ4+RxpN9yMp751dta5 h1oCLLlIZvgMO8HfMC1oTgy8PmclqzlWY9C4nmATnIuvT7MCNzkxCGWBtzvnfKBss0wB AAoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ka/r1ARHAretBEN98Qt5zaqAz6lgyo2D5ccRG93/97E=; b=EKP9Q/AIdN/tGS5ElRerZFHJa0deFyvIstxtG+mXrY8wuuRTx/qofJCGJ0Ve4+iFHt g7m08WjKISSBuKW3uUgyTsNsfrBj1rl04Nmo4zD9XJZsYIirP6rs2iAbiZvDb8ZGii1v +MfD/YPfaYNK+5mIv1orUxV44lnXr5bi+dKrm/0tHKuxdvPWhcfWrkwHXTAPuIkKaIOb M0i5QviMORqhxkBezBnsYFsV1cqu8dDM40QepWu3efozin3QGnkrRAtybW4Hd5G8jUfy OofgmTSiGCcKEMXjFIcWPMQ6GfEy/A986K69I2Pc71vOT6CpkbY+Ctju4V28QWrAzsih WmPg== X-Gm-Message-State: AA+aEWbiL+uSMfQBIhXZ4EeUvG0fZNxwq3Wrk6XKvj+WXz2feWvFxk19 HctVKrHqiKQoZdL2TAMcdlJdi+WK X-Google-Smtp-Source: AFSGD/VDwEpOZqx2vgyPieO5dOW/CM3ibLKm8dm1tQjD2gW76iDYom4fwYUKWNmvF2kDkafUql/G9g== X-Received: by 2002:a1c:96ce:: with SMTP id y197mr2542331wmd.36.1543674112947; Sat, 01 Dec 2018 06:21:52 -0800 (PST) Received: from alpine.nodomain (host-31-193-36-105-dynamic.telecomitaliasm.net. [31.193.36.105]) by smtp.gmail.com with ESMTPSA id l20sm16863255wrb.93.2018.12.01.06.21.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Dec 2018 06:21:52 -0800 (PST) From: Alex Raschi To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] testing/nomacs: fix installation with ffmpeg 4+ Date: Sat, 1 Dec 2018 15:21:44 +0100 Message-Id: <20181201142144.29376-1-raschi.alex@gmail.com> X-Mailer: git-send-email 2.19.2 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit * disable opencv (raw and tiff options depends on opencv) After ffmpeg update to 4+, opencv is broken and unless updated it can't be built right now. --- testing/nomacs/APKBUILD | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/testing/nomacs/APKBUILD b/testing/nomacs/APKBUILD index 8f6f65609b..687b73a8ed 100644 --- a/testing/nomacs/APKBUILD +++ b/testing/nomacs/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Alex Raschi pkgname=nomacs pkgver=3.12 -pkgrel=0 +pkgrel=1 pkgdesc="Small and fast Qt image viewer" url="https://nomacs.org/" arch="all" @@ -12,10 +12,6 @@ makedepends="cmake qt5-qttools-dev qt5-qtsvg-dev exiv2-dev - libraw-dev - opencv - opencv-dev - tiff-dev quazip-qt5-dev libwebp-dev lcov @@ -36,6 +32,9 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DENABLE_OPENCV=False \ + -DENABLE_RAW=False \ + -DENABLE_TIFF=False \ -DENABLE_QT_DEBUG=False \ -DENABLE_TRANSLATIONS=True \ -DENABLE_PLUGINS=False \ -- 2.19.2 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---