From unknown Sat Sep 20 07:52:28 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30678] [PATCH] Update VLC to 3.0.1 Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Mar 2018 16:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 30678 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 30678@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches" Received: via spool by submit@debbugs.gnu.org id=B.152000806618661 (code B ref -1); Fri, 02 Mar 2018 16:28:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Mar 2018 16:27:46 +0000 Received: from localhost ([127.0.0.1]:41457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ernX6-0004qr-Ko for submit@debbugs.gnu.org; Fri, 02 Mar 2018 11:27:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erh1l-0007Zt-03 for submit@debbugs.gnu.org; Fri, 02 Mar 2018 04:30:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erh1Z-00016B-Ht for submit@debbugs.gnu.org; Fri, 02 Mar 2018 04:30:51 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,FREEMAIL_FROM, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:38002) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erh1Z-000163-E4 for submit@debbugs.gnu.org; Fri, 02 Mar 2018 04:30:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erh1X-0002Mx-M6 for guix-patches@gnu.org; Fri, 02 Mar 2018 04:30:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erh1V-00013V-1h for guix-patches@gnu.org; Fri, 02 Mar 2018 04:30:43 -0500 Received: from aibo.runbox.com ([91.220.196.211]:60652) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1erh1U-00011W-Gh for guix-patches@gnu.org; Fri, 02 Mar 2018 04:30:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=rbselector1; h=Message-Id:Date:Subject:To:From:MIME-Version: Content-Transfer-Encoding:Content-Type; bh=NIjsgUUFzvyxzUiM7cTUfM0+UgYsjQ6701KFXceHKE4=; b=bDQNVINhg59P/OPLLNeSMv+v/O Ue8D4UwR0xSUiNbX+L8YYa1CTIuxyIxAH15VVKzaGkVWhxHrv5oAIw13Ruu7mOwQJMGs+Wcui1S31 /1stG9y+eKPBFqkkIgLjUjWjbp5E2oyXDZtWfUKMAF5OOvjuge9Vd+/o5LrA4xlCjoAoHKbGZui4m zqFkjxbQK1AnirD0jHNXaAxrYQWd5CljYgIeFpWJIqTEhU1mKuq/R7hemkFMnjoQqzUo5iachxDnk Z1mZyUWDjJeZBR4BkT76Zl5FY484qIUXHvm9r5zyi8dmvxXzhAUwY4yMnyBLlD+UsyX+kE1GmirsE d0D6w5LA==; Received: from [10.9.9.129] (helo=rmmprod07.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1erh1R-0005A6-Bv for guix-patches@gnu.org; Fri, 02 Mar 2018 10:30:37 +0100 Received: from mail by rmmprod07.runbox with local (Exim 4.86_2) (envelope-from ) id 1erh1R-0003kv-9o for guix-patches@gnu.org; Fri, 02 Mar 2018 10:30:37 +0100 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Received: from [Authenticated user (850733)] by runbox.com with http (RMM6); for ; Fri, 02 Mar 2018 09:30:37 GMT From: Date: Fri, 02 Mar 2018 09:30:37 +0000 (GMT) X-Mailer: RMM6 Message-Id: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Mailman-Approved-At: Fri, 02 Mar 2018 11:27:43 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8190b0ffc..d668d8235 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -53,7 +53,6 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system meson) - #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system waf) #:use-module (gnu packages) @@ -61,6 +60,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) + #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -89,10 +89,12 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages gcc) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages iso-codes) #:use-module (gnu packages libreoffice) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages m4) @@ -103,12 +105,14 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) + #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages qt) #:use-module (gnu packages ruby) + #:use-module (gnu packages samba) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) #:use-module (gnu packages shells) @@ -116,6 +120,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) + #:use-module (gnu packages upnp) #:use-module (gnu packages version-control) #:use-module (gnu packages vulkan) #:use-module (gnu packages web) @@ -810,7 +815,7 @@ audio/video codec library.") (define-public vlc (package (name "vlc") - (version "2.2.8") + (version "3.0.1") (source (origin (method url-fetch) (uri (string-append @@ -818,10 +823,11 @@ audio/video codec library.") version "/vlc-" version ".tar.xz")) (sha256 (base32 - "1v32snw46rkgbdqdy3dssl2y13i8p2cr1cw1i18r6vdmiy24dw4v")))) + "008krfhykm9447wc1kkw82bsw3f6ikljgrqyb1sinwlxnkghqw6f")))) (build-system gnu-build-system) (native-inputs `(("git" ,git) ; needed for a test + ("gcc" ,gcc) ("pkg-config" ,pkg-config))) ;; FIXME: Add optional inputs once available. (inputs @@ -829,7 +835,7 @@ audio/video codec library.") ("avahi" ,avahi) ("dbus" ,dbus) ("flac" ,flac) - ("ffmpeg" ,ffmpeg-2.8) ;fails to build against ffmpeg= 3.0 + ("ffmpeg" ,ffmpeg) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("gnutls" ,gnutls) @@ -857,16 +863,54 @@ audio/video codec library.") ("perl" ,perl) ("pulseaudio" ,pulseaudio) ("python" ,python-wrapper) - ("qtbase" ,qtbase) + ;; Qt required instead of just qtbase as it was + ;; before, otherwise check_POTFILES.sh test fails. + ("qt" ,qt)=20 ("qtx11extras" ,qtx11extras) ("sdl" ,sdl) ("sdl-image" ,sdl-image) ("speex" ,speex) ("x265" ,x265) - ("xcb-util-keysyms" ,xcb-util-keysyms))) + ("xcb-util-keysyms" ,xcb-util-keysyms) + ;Optional inputs + ;("lua" ,lua) ;Configure phase doesn't find this + ("libarchive" ,libarchive) + ("livemedia-utils" ,livemedia-utils) + ("libbluray" ,libbluray) + ("samba" ,samba) + ;("nfs-utils" ,(@ (gnu packages nfs) nfs-utils)) ;configure phase d= oesn't find this + ;("freerdp" ,(@ (gnu packages rdesktop) freerdp)) ;causes compilati= on failure + ("libshout" ,libshout) + ("libebml" ,libebml) + ("libmatroska" ,libmatroska) + ("libmodplug" ,libmodplug) + ("mpg123" ,mpg123) + ;("gstreamer" + ; ,(@ (gnu packages gstreamer) gstreamer)) ;configure phase doesn't= find this. + ("libva" ,libva) + ("twolame" ,twolame) + ("libdca" ,libdca) + ("libmpeg2" ,libmpeg2) + ("speexdsp" ,speexdsp) + ("fluidsynth" ,fluidsynth) + ("libass" ,libass) + ("fribidi" ,fribidi) + ("librsvg" ,librsvg) + ("libcaca" ,libcaca) + ("jack" ,jack-1) + ("soxr" ,soxr) + ("chromaprint" ,chromaprint) + ("protobuf" ,protobuf) + ("eudev" ,eudev) + ("libmtp" ,libmtp) + ("libupnp" ,libupnp) + ("taglib" ,taglib) + ("libsecret" ,libsecret) + ("libnotify" ,libnotify))) (arguments `(#:configure-flags `("CXXFLAGS=3D-std=3Dgnu++11" + "BUILDCC=3Dgcc" ,(string-append "LDFLAGS=3D-Wl,-rpath -Wl," (assoc-ref %build-inputs "ffmpeg") "/lib")) ;needed for the tests @@ -883,10 +927,12 @@ audio/video codec library.") ;; which fails in our sandboxed build system (substitute* "test/run_vlc.sh" (("./vlc --ignore-config") "echo")) - ;; XXX Likely not needed for >2.2.6. - (substitute* "modules/gui/qt4/components/interface_widgets.= cpp" - (("") "")) #t))) + (add-after 'build 'fix-misnamed-appdata + ;; vlc.appdata.xml.in gets created instead of vlc.appdata.xml, = so + ;; we copy it to the correct name - This solution is hacky, if the + ;; root cause is found then please supply a patch. + (lambda _ (copy-file "share/vlc.appdata.xml.in" "share/vlc.appd= ata.xml"))) (add-after 'install 'regenerate-plugin-cache (lambda* (#:key outputs #:allow-other-keys) ;; The 'install-exec-hook' rule in the top-level Makefile.am From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 03 16:23:38 2018 Received: (at control) by debbugs.gnu.org; 3 Mar 2018 21:23:38 +0000 Received: from localhost ([127.0.0.1]:43117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esEcz-0003oI-SV for submit@debbugs.gnu.org; Sat, 03 Mar 2018 16:23:37 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:54472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esEcy-0003o8-Dl for control@debbugs.gnu.org; Sat, 03 Mar 2018 16:23:36 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id EC0CF11D90 for ; Sat, 3 Mar 2018 22:23:35 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wN-Kpa1Jqk8f for ; Sat, 3 Mar 2018 22:23:35 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 4B8E711CE1 for ; Sat, 3 Mar 2018 22:23:35 +0100 (CET) Date: Sat, 03 Mar 2018 22:23:34 +0100 Message-Id: <87bmg4am5l.fsf@gnu.org> To: control@debbugs.gnu.org From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: control message for bug #30678 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) merge 30678 30679 From unknown Sat Sep 20 07:52:28 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30678] [PATCH] Update VLC to 3.0.1 Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Mar 2018 18:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30678 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: miles.harvey@runbox.com, 30678@debbugs.gnu.org Received: via spool by 30678-submit@debbugs.gnu.org id=B30678.152208904421646 (code B ref 30678); Mon, 26 Mar 2018 18:31:02 +0000 Received: (at 30678) by debbugs.gnu.org; 26 Mar 2018 18:30:44 +0000 Received: from localhost ([127.0.0.1]:54732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f0WtI-0005d4-E7 for submit@debbugs.gnu.org; Mon, 26 Mar 2018 14:30:44 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:42307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f0WtE-0005ct-QO for 30678@debbugs.gnu.org; Mon, 26 Mar 2018 14:30:42 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8326821754; Mon, 26 Mar 2018 14:30:40 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 26 Mar 2018 14:30:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=M33iZpBhMg4tdIAy7RJI9Jv+uQz6NLh/8lDF8FPlYTM=; b=Lqcv24gi yHJ84WmbxYPlJY827+X99drp8eG9SRra85OcrRsteXWUTe4UhZJH0olDarGHn7zV wIr2iaxvza6ulhGEwGInd6z7QL0DeTFYEfzb3af+XSPPuQUrHpDXsdbUmGHYcY9P UPTAZPPkEapP5LirZwZaBuXsmDT+V58X6yq/R+W8NbiRV4pI5xz6WmPQMZRRY3n+ 8Iq2msy93tYqhFH5l4Kq77Cok4ef/slGVI8sYMVa1NyXeT13lBk+2UfSb+9kwLd1 Rcwfuw2es7oEs7BCq12uMPyEAcwPRJb0ZdDRBDXzDk0f2yf+vOXlm+wSFUPOnlzf Nlv9hvHLohf9aQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=M33iZpBhMg4tdIAy7RJI9Jv+uQz6N Lh/8lDF8FPlYTM=; b=klQdbUezjc7sj68R2XwfQK+1mOugfOLGKnw2hm+HdB6X9 ytNpr3Dv0cZwYClROPwgPZBYHLK+Ci5bEfglevAnd8jcAwNrngdgPzvgiyc+l7ZD Hwhwg9lon54XsqkOLMe4Tj+E6/oXfyMwpWXLWLWpUUyxhvcV+w5hL0zKwDg9T5ST vGz5LCsT0f+3tNP8Fa9YxHdK5M8fIaby3OrlzTs0mTKpOQQkuUZweC8/menj290/ UPpcLk7tj/bFyw7v7Dtg02dW+Q0RvgfUxLXX8nNwRHaS2nzW9/UAdHjI9NUiizep joCbWFI0osNORIxoX0dofyKS/yfAss4PZFjxgsDkA== X-ME-Sender: Received: from localhost (ti0089a400-2222.bb.online.no [88.89.166.190]) by mail.messagingengine.com (Postfix) with ESMTPA id 1203C1025B; Mon, 26 Mar 2018 14:30:39 -0400 (EDT) From: Marius Bakke In-Reply-To: References: User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Mon, 26 Mar 2018 20:30:38 +0200 Message-ID: <87in9iit9t.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello! Sorry for the sloooow response. miles.harvey@runbox.com writes: > diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm > index 8190b0ffc..d668d8235 100644 > --- a/gnu/packages/video.scm > +++ b/gnu/packages/video.scm Can you resubmit this patch using "git format-patch"? Please also take a look at the git log for conventions. Some comments below. > (build-system gnu-build-system) > (native-inputs > `(("git" ,git) ; needed for a test > + ("gcc" ,gcc) Do you know why GCC is needed? Normally the one provided by gnu-build-system is sufficient. > @@ -857,16 +863,54 @@ audio/video codec library.") > ("perl" ,perl) > ("pulseaudio" ,pulseaudio) > ("python" ,python-wrapper) > - ("qtbase" ,qtbase) > + ;; Qt required instead of just qtbase as it was > + ;; before, otherwise check_POTFILES.sh test fails. > + ("qt" ,qt)=20 The "qt" package frequently lags behind the "modular" Qt, so we try to get rid of the former. Maybe it requires some of the other Qt "modules"? What is the error message? > ("qtx11extras" ,qtx11extras) > ("sdl" ,sdl) > ("sdl-image" ,sdl-image) > ("speex" ,speex) > ("x265" ,x265) > - ("xcb-util-keysyms" ,xcb-util-keysyms))) > + ("xcb-util-keysyms" ,xcb-util-keysyms) > + ;Optional inputs > + ;("lua" ,lua) ;Configure phase doesn't find this > + ("libarchive" ,libarchive) > + ("livemedia-utils" ,livemedia-utils) > + ("libbluray" ,libbluray) > + ("samba" ,samba) > + ;("nfs-utils" ,(@ (gnu packages nfs) nfs-utils)) ;configure phase= doesn't find this > + ;("freerdp" ,(@ (gnu packages rdesktop) freerdp)) ;causes compila= tion failure > + ("libshout" ,libshout) > + ("libebml" ,libebml) > + ("libmatroska" ,libmatroska) > + ("libmodplug" ,libmodplug) > + ("mpg123" ,mpg123) > + ;("gstreamer" > + ; ,(@ (gnu packages gstreamer) gstreamer)) ;configure phase doesn= 't find this. > + ("libva" ,libva) > + ("twolame" ,twolame) > + ("libdca" ,libdca) > + ("libmpeg2" ,libmpeg2) > + ("speexdsp" ,speexdsp) > + ("fluidsynth" ,fluidsynth) > + ("libass" ,libass) > + ("fribidi" ,fribidi) > + ("librsvg" ,librsvg) > + ("libcaca" ,libcaca) > + ("jack" ,jack-1) > + ("soxr" ,soxr) > + ("chromaprint" ,chromaprint) > + ("protobuf" ,protobuf) > + ("eudev" ,eudev) > + ("libmtp" ,libmtp) > + ("libupnp" ,libupnp) > + ("taglib" ,taglib) > + ("libsecret" ,libsecret) > + ("libnotify" ,libnotify))) Wooooow, that's a lot of new dependencies! Can you preserve the alphabetical sorting of inputs? Thanks for working on it! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlq5PE4ACgkQoqBt8qM6 VPoRnQgAzawdpW058oxSmHwq51ujVM0HxOQ8wDWRBSUSc2KjLAfjW0u9B9L08JC0 KHqh34u1ShqrDN+I3Z12DzxPPPJXEBJm8nHt0C3COMe7Zh8uP6WmP0m9LPqIAalt xg4PzkypRwsIwoTrop3gEemkDT53bDALULYc7v99P1rMJI9kZn2WTwd8ktv2oW78 gchqsVfDZwYV1/oGFZN4Un78PleJ6PVHFi8ksmBGuQs961RQitMwTZMgjLdKvF/M V5UJuB1zBujsGJGSISbBAstIG3gR+HeKwqthQJuSbpr/fZWMnoldIk2N8Kwo7l/p B4va92cDg8TmXZvUVVdVXyy2V4hp7A== =gM8p -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Sep 20 07:52:28 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Subject: bug#30678: closed (Re: [bug#30678] [PATCH] Update VLC to 3.0.1) Message-ID: References: <20180829205623.GA18756@jasmine.lan> X-Gnu-PR-Message: they-closed 30678 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 30678@debbugs.gnu.org Date: Wed, 29 Aug 2018 20:57:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1535576221-18975-1" This is a multi-part message in MIME format... ------------=_1535576221-18975-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #30678: [PATCH] Update VLC to 3.0.1 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 30678@debbugs.gnu.org. --=20 30678: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D30678 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1535576221-18975-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 30678-done) by debbugs.gnu.org; 29 Aug 2018 20:56:31 +0000 Received: from localhost ([127.0.0.1]:37493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fv7Vv-0004vH-As for submit@debbugs.gnu.org; Wed, 29 Aug 2018 16:56:31 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:58667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fv7Vu-0004v9-06 for 30678-done@debbugs.gnu.org; Wed, 29 Aug 2018 16:56:30 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id CAF3C21193; Wed, 29 Aug 2018 16:56:29 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 29 Aug 2018 16:56:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= mesmtp; bh=GGZQRvK3MU91K6UyQ3PDqE1FoQvG4oOzd4llHEuLWC4=; b=HL22/ 7LVuyrDEiSQmY8LV0gECAbP+aMDV35Ak1nzzUUD+WVIw4trNUsLCRbijyWYKKz/9 fQjr2YXi/W3KZp7OfklHdITBy/iTIk870uR1ZjZzYTAgdN5oPmviRHl1SxmVjw/A 90G48qxMtjg08gUhIhZKpY+rAdUIE2nrY9gwm4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=GGZQRvK3MU91K6UyQ3PDqE1FoQvG4 oOzd4llHEuLWC4=; b=P62AtPdExzN4cbaqOsu3QKvs2FzTYDCWwMObJB392yLec ZNZuhS/IpHLIMMp5oTc1eFsQLV2icFew3ypDh20vjME9BteNo5fFNCyTbohONqTC +OhMh8cjImQNsdB1+A1pvd8hSkTlY2Cx43MMzBrFecsF5EwCQEwxEmEJzuhYs9ec WR/37S/EMcf1aF3JPGAK9tLdaotytZwR3UHUUFL48eXYXOZ4C/8GX9z1Uoxp5l3Z N/YGtTnZUCA87reTsrbkcLqgUDMXAdkAMaPCx6p1RG46AEqwUL8+aKbFJM1PCpb5 30aXdf+S5QIhbd+inUJB4wRvVXmwFJ6aZOvjl5sdQ== X-ME-Proxy: X-ME-Sender: Received: from localhost (c-76-124-202-137.hsd1.pa.comcast.net [76.124.202.137]) by mail.messagingengine.com (Postfix) with ESMTPA id CA2A6E464C; Wed, 29 Aug 2018 16:56:24 -0400 (EDT) Date: Wed, 29 Aug 2018 16:56:23 -0400 From: Leo Famulari To: Marius Bakke Subject: Re: [bug#30678] [PATCH] Update VLC to 3.0.1 Message-ID: <20180829205623.GA18756@jasmine.lan> References: <87in9iit9t.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="FCuugMFkClbJLl1L" Content-Disposition: inline In-Reply-To: <87in9iit9t.fsf@fastmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30678-done Cc: miles.harvey@runbox.com, 30678-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --FCuugMFkClbJLl1L Content-Type: text/plain; charset=us-ascii Content-Disposition: inline VLC was updated to 3.0.3 in commit d0e23e3940bb122cca5657e89e14ae5b7db49be4, so I think this patch is no longer needed. I'm closing the bug; please let me know if it should be re-opened. --FCuugMFkClbJLl1L Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAluHCHcACgkQJkb6MLrK fwh0YA//UA0hUZhTeHMwc8R3EtFw+xYJLvxcMESclFkbkLNzwF5y2MlNXNBy7SmY 3OlbDsdb18ml+KA2o1MmZUION6CwCHcoiPAZt1vwoc503AgTSCC0ip73b/dRuCgE y5SPkK1huIBN1FZuuOuvh+51K+cEoLb/z+wRrW+JqNfD6djEaSv26ut06r+2RAnG e/39czWC2V+L7d9LOa7Tl87xUeoungeR51Q28fw4ezrVqGcB5LMiDlq+ucOpZOe/ a4zIKj5Cn19w5dikrESElFl3Ava5hgWdJ8vP45mUiEO1pePLurOiovzS5gjj3E/0 YSxMnj9D1WuMnvYRQK/4BZRhJokZYmKw5etZvq/0ury2EuszDrhYc3qyOTeYqTuK bINNaK9ZZSr42hPLT8VcSTzz/oz4ijoyOJ24Jvj3qQx75bmyJqSvWAOzjaVpoZOn /HFbf2zUw7rO2yRW2rR5NoYl7eO1jAcXkcLHYfXMTlRKFIK5FwkwT4XY+gr8n6+s zSDFEC9SIlgdL3pjmNHCg4prktvigXoXnOn7yy5EuH4oTwe9uGiPUrFV8tc3xlTs cOZ4r5vWVa26Igg24WlLeR/AioulH2jliC2V3JJU9gjAgBLznkaSaigm7qimiP4W a4uwLYox5IJemwWArb1oOq6FjPcuI1PSu7shIBtE8vsPRlLqVQc= =kt5a -----END PGP SIGNATURE----- --FCuugMFkClbJLl1L-- ------------=_1535576221-18975-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 2 Mar 2018 16:27:46 +0000 Received: from localhost ([127.0.0.1]:41457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ernX6-0004qr-Ko for submit@debbugs.gnu.org; Fri, 02 Mar 2018 11:27:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erh1l-0007Zt-03 for submit@debbugs.gnu.org; Fri, 02 Mar 2018 04:30:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erh1Z-00016B-Ht for submit@debbugs.gnu.org; Fri, 02 Mar 2018 04:30:51 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,FREEMAIL_FROM, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:38002) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erh1Z-000163-E4 for submit@debbugs.gnu.org; Fri, 02 Mar 2018 04:30:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erh1X-0002Mx-M6 for guix-patches@gnu.org; Fri, 02 Mar 2018 04:30:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erh1V-00013V-1h for guix-patches@gnu.org; Fri, 02 Mar 2018 04:30:43 -0500 Received: from aibo.runbox.com ([91.220.196.211]:60652) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1erh1U-00011W-Gh for guix-patches@gnu.org; Fri, 02 Mar 2018 04:30:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=rbselector1; h=Message-Id:Date:Subject:To:From:MIME-Version: Content-Transfer-Encoding:Content-Type; bh=NIjsgUUFzvyxzUiM7cTUfM0+UgYsjQ6701KFXceHKE4=; b=bDQNVINhg59P/OPLLNeSMv+v/O Ue8D4UwR0xSUiNbX+L8YYa1CTIuxyIxAH15VVKzaGkVWhxHrv5oAIw13Ruu7mOwQJMGs+Wcui1S31 /1stG9y+eKPBFqkkIgLjUjWjbp5E2oyXDZtWfUKMAF5OOvjuge9Vd+/o5LrA4xlCjoAoHKbGZui4m zqFkjxbQK1AnirD0jHNXaAxrYQWd5CljYgIeFpWJIqTEhU1mKuq/R7hemkFMnjoQqzUo5iachxDnk Z1mZyUWDjJeZBR4BkT76Zl5FY484qIUXHvm9r5zyi8dmvxXzhAUwY4yMnyBLlD+UsyX+kE1GmirsE d0D6w5LA==; Received: from [10.9.9.129] (helo=rmmprod07.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1erh1R-0005A6-Bv for guix-patches@gnu.org; Fri, 02 Mar 2018 10:30:37 +0100 Received: from mail by rmmprod07.runbox with local (Exim 4.86_2) (envelope-from ) id 1erh1R-0003kv-9o for guix-patches@gnu.org; Fri, 02 Mar 2018 10:30:37 +0100 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Received: from [Authenticated user (850733)] by runbox.com with http (RMM6); for ; Fri, 02 Mar 2018 09:30:37 GMT From: To: "guix-patches" Subject: [PATCH] Update VLC to 3.0.1 Date: Fri, 02 Mar 2018 09:30:37 +0000 (GMT) X-Mailer: RMM6 Message-Id: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Fri, 02 Mar 2018 11:27:43 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8190b0ffc..d668d8235 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -53,7 +53,6 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system meson) - #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system waf) #:use-module (gnu packages) @@ -61,6 +60,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) + #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -89,10 +89,12 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages gcc) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages iso-codes) #:use-module (gnu packages libreoffice) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages m4) @@ -103,12 +105,14 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) + #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages qt) #:use-module (gnu packages ruby) + #:use-module (gnu packages samba) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) #:use-module (gnu packages shells) @@ -116,6 +120,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) + #:use-module (gnu packages upnp) #:use-module (gnu packages version-control) #:use-module (gnu packages vulkan) #:use-module (gnu packages web) @@ -810,7 +815,7 @@ audio/video codec library.") (define-public vlc (package (name "vlc") - (version "2.2.8") + (version "3.0.1") (source (origin (method url-fetch) (uri (string-append @@ -818,10 +823,11 @@ audio/video codec library.") version "/vlc-" version ".tar.xz")) (sha256 (base32 - "1v32snw46rkgbdqdy3dssl2y13i8p2cr1cw1i18r6vdmiy24dw4v")))) + "008krfhykm9447wc1kkw82bsw3f6ikljgrqyb1sinwlxnkghqw6f")))) (build-system gnu-build-system) (native-inputs `(("git" ,git) ; needed for a test + ("gcc" ,gcc) ("pkg-config" ,pkg-config))) ;; FIXME: Add optional inputs once available. (inputs @@ -829,7 +835,7 @@ audio/video codec library.") ("avahi" ,avahi) ("dbus" ,dbus) ("flac" ,flac) - ("ffmpeg" ,ffmpeg-2.8) ;fails to build against ffmpeg= 3.0 + ("ffmpeg" ,ffmpeg) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("gnutls" ,gnutls) @@ -857,16 +863,54 @@ audio/video codec library.") ("perl" ,perl) ("pulseaudio" ,pulseaudio) ("python" ,python-wrapper) - ("qtbase" ,qtbase) + ;; Qt required instead of just qtbase as it was + ;; before, otherwise check_POTFILES.sh test fails. + ("qt" ,qt)=20 ("qtx11extras" ,qtx11extras) ("sdl" ,sdl) ("sdl-image" ,sdl-image) ("speex" ,speex) ("x265" ,x265) - ("xcb-util-keysyms" ,xcb-util-keysyms))) + ("xcb-util-keysyms" ,xcb-util-keysyms) + ;Optional inputs + ;("lua" ,lua) ;Configure phase doesn't find this + ("libarchive" ,libarchive) + ("livemedia-utils" ,livemedia-utils) + ("libbluray" ,libbluray) + ("samba" ,samba) + ;("nfs-utils" ,(@ (gnu packages nfs) nfs-utils)) ;configure phase d= oesn't find this + ;("freerdp" ,(@ (gnu packages rdesktop) freerdp)) ;causes compilati= on failure + ("libshout" ,libshout) + ("libebml" ,libebml) + ("libmatroska" ,libmatroska) + ("libmodplug" ,libmodplug) + ("mpg123" ,mpg123) + ;("gstreamer" + ; ,(@ (gnu packages gstreamer) gstreamer)) ;configure phase doesn't= find this. + ("libva" ,libva) + ("twolame" ,twolame) + ("libdca" ,libdca) + ("libmpeg2" ,libmpeg2) + ("speexdsp" ,speexdsp) + ("fluidsynth" ,fluidsynth) + ("libass" ,libass) + ("fribidi" ,fribidi) + ("librsvg" ,librsvg) + ("libcaca" ,libcaca) + ("jack" ,jack-1) + ("soxr" ,soxr) + ("chromaprint" ,chromaprint) + ("protobuf" ,protobuf) + ("eudev" ,eudev) + ("libmtp" ,libmtp) + ("libupnp" ,libupnp) + ("taglib" ,taglib) + ("libsecret" ,libsecret) + ("libnotify" ,libnotify))) (arguments `(#:configure-flags `("CXXFLAGS=3D-std=3Dgnu++11" + "BUILDCC=3Dgcc" ,(string-append "LDFLAGS=3D-Wl,-rpath -Wl," (assoc-ref %build-inputs "ffmpeg") "/lib")) ;needed for the tests @@ -883,10 +927,12 @@ audio/video codec library.") ;; which fails in our sandboxed build system (substitute* "test/run_vlc.sh" (("./vlc --ignore-config") "echo")) - ;; XXX Likely not needed for >2.2.6. - (substitute* "modules/gui/qt4/components/interface_widgets.= cpp" - (("") "")) #t))) + (add-after 'build 'fix-misnamed-appdata + ;; vlc.appdata.xml.in gets created instead of vlc.appdata.xml, = so + ;; we copy it to the correct name - This solution is hacky, if the + ;; root cause is found then please supply a patch. + (lambda _ (copy-file "share/vlc.appdata.xml.in" "share/vlc.appd= ata.xml"))) (add-after 'install 'regenerate-plugin-cache (lambda* (#:key outputs #:allow-other-keys) ;; The 'install-exec-hook' rule in the top-level Makefile.am ------------=_1535576221-18975-1-- From unknown Sat Sep 20 07:52:28 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Subject: bug#30679: closed (Re: [bug#30678] [PATCH] Update VLC to 3.0.1) Message-ID: References: <20180829205623.GA18756@jasmine.lan> X-Gnu-PR-Message: they-closed 30679 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 30679@debbugs.gnu.org Date: Wed, 29 Aug 2018 20:57:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1535576222-18975-3" This is a multi-part message in MIME format... ------------=_1535576222-18975-3 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #30678: [PATCH] Update VLC to 3.0.1 (Fixed submission - second try) which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 30679@debbugs.gnu.org. --=20 30678: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D30678 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1535576222-18975-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 30678-done) by debbugs.gnu.org; 29 Aug 2018 20:56:31 +0000 Received: from localhost ([127.0.0.1]:37493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fv7Vv-0004vH-As for submit@debbugs.gnu.org; Wed, 29 Aug 2018 16:56:31 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:58667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fv7Vu-0004v9-06 for 30678-done@debbugs.gnu.org; Wed, 29 Aug 2018 16:56:30 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id CAF3C21193; Wed, 29 Aug 2018 16:56:29 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 29 Aug 2018 16:56:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= mesmtp; bh=GGZQRvK3MU91K6UyQ3PDqE1FoQvG4oOzd4llHEuLWC4=; b=HL22/ 7LVuyrDEiSQmY8LV0gECAbP+aMDV35Ak1nzzUUD+WVIw4trNUsLCRbijyWYKKz/9 fQjr2YXi/W3KZp7OfklHdITBy/iTIk870uR1ZjZzYTAgdN5oPmviRHl1SxmVjw/A 90G48qxMtjg08gUhIhZKpY+rAdUIE2nrY9gwm4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=GGZQRvK3MU91K6UyQ3PDqE1FoQvG4 oOzd4llHEuLWC4=; b=P62AtPdExzN4cbaqOsu3QKvs2FzTYDCWwMObJB392yLec ZNZuhS/IpHLIMMp5oTc1eFsQLV2icFew3ypDh20vjME9BteNo5fFNCyTbohONqTC +OhMh8cjImQNsdB1+A1pvd8hSkTlY2Cx43MMzBrFecsF5EwCQEwxEmEJzuhYs9ec WR/37S/EMcf1aF3JPGAK9tLdaotytZwR3UHUUFL48eXYXOZ4C/8GX9z1Uoxp5l3Z N/YGtTnZUCA87reTsrbkcLqgUDMXAdkAMaPCx6p1RG46AEqwUL8+aKbFJM1PCpb5 30aXdf+S5QIhbd+inUJB4wRvVXmwFJ6aZOvjl5sdQ== X-ME-Proxy: X-ME-Sender: Received: from localhost (c-76-124-202-137.hsd1.pa.comcast.net [76.124.202.137]) by mail.messagingengine.com (Postfix) with ESMTPA id CA2A6E464C; Wed, 29 Aug 2018 16:56:24 -0400 (EDT) Date: Wed, 29 Aug 2018 16:56:23 -0400 From: Leo Famulari To: Marius Bakke Subject: Re: [bug#30678] [PATCH] Update VLC to 3.0.1 Message-ID: <20180829205623.GA18756@jasmine.lan> References: <87in9iit9t.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="FCuugMFkClbJLl1L" Content-Disposition: inline In-Reply-To: <87in9iit9t.fsf@fastmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30678-done Cc: miles.harvey@runbox.com, 30678-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --FCuugMFkClbJLl1L Content-Type: text/plain; charset=us-ascii Content-Disposition: inline VLC was updated to 3.0.3 in commit d0e23e3940bb122cca5657e89e14ae5b7db49be4, so I think this patch is no longer needed. I'm closing the bug; please let me know if it should be re-opened. --FCuugMFkClbJLl1L Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAluHCHcACgkQJkb6MLrK fwh0YA//UA0hUZhTeHMwc8R3EtFw+xYJLvxcMESclFkbkLNzwF5y2MlNXNBy7SmY 3OlbDsdb18ml+KA2o1MmZUION6CwCHcoiPAZt1vwoc503AgTSCC0ip73b/dRuCgE y5SPkK1huIBN1FZuuOuvh+51K+cEoLb/z+wRrW+JqNfD6djEaSv26ut06r+2RAnG e/39czWC2V+L7d9LOa7Tl87xUeoungeR51Q28fw4ezrVqGcB5LMiDlq+ucOpZOe/ a4zIKj5Cn19w5dikrESElFl3Ava5hgWdJ8vP45mUiEO1pePLurOiovzS5gjj3E/0 YSxMnj9D1WuMnvYRQK/4BZRhJokZYmKw5etZvq/0ury2EuszDrhYc3qyOTeYqTuK bINNaK9ZZSr42hPLT8VcSTzz/oz4ijoyOJ24Jvj3qQx75bmyJqSvWAOzjaVpoZOn /HFbf2zUw7rO2yRW2rR5NoYl7eO1jAcXkcLHYfXMTlRKFIK5FwkwT4XY+gr8n6+s zSDFEC9SIlgdL3pjmNHCg4prktvigXoXnOn7yy5EuH4oTwe9uGiPUrFV8tc3xlTs cOZ4r5vWVa26Igg24WlLeR/AioulH2jliC2V3JJU9gjAgBLznkaSaigm7qimiP4W a4uwLYox5IJemwWArb1oOq6FjPcuI1PSu7shIBtE8vsPRlLqVQc= =kt5a -----END PGP SIGNATURE----- --FCuugMFkClbJLl1L-- ------------=_1535576222-18975-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 2 Mar 2018 16:28:16 +0000 Received: from localhost ([127.0.0.1]:41461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ernXb-0004sG-SI for submit@debbugs.gnu.org; Fri, 02 Mar 2018 11:28:16 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eri3f-0000hC-DH for submit@debbugs.gnu.org; Fri, 02 Mar 2018 05:36:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eri3Y-00028A-St for submit@debbugs.gnu.org; Fri, 02 Mar 2018 05:36:54 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.3 required=5.0 tests=BAYES_40, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,FREEMAIL_REPLY,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:58458) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eri3Y-000285-O4 for submit@debbugs.gnu.org; Fri, 02 Mar 2018 05:36:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eri3X-0006tT-3W for guix-patches@gnu.org; Fri, 02 Mar 2018 05:36:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eri3T-00026I-7i for guix-patches@gnu.org; Fri, 02 Mar 2018 05:36:51 -0500 Received: from aibo.runbox.com ([91.220.196.211]:44622) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eri3S-000257-Rj for guix-patches@gnu.org; Fri, 02 Mar 2018 05:36:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=rbselector1; h=Message-Id:Content-Type:Date:Subject:To:From:MIME-Version; bh=nLo1XeTiDCQRxklxlfhdQdO1nY8B6vk2Z8QZdbnuaw0=; b=pRftujYRW+zfqCjBKSdKKp5yW zMSDUYaWIkbPuhRNR9XFX2pHSHQc9agcFMwBDErfLxdX+hwzaShw5gwMNW3NQOnEIQCqUr0iKuazg 38Q5u1xPEcLkLlxv/CDGS7pyYAI/NFTfvoabQ2TmE7iQtrMgP82R2NDkx+B50gT5OcjbIJa2GdObs cReHP4sS8VpRA3aboSrDocDlCbEYaIt2atNDtqOV/kPJEmpKz1S3yitax2x+yatTGxYaIRL0xEcgz kAHfvshjxriHPr3zsSbMu0zC10XeFUKc8KhRhWXrLC/z70+XqTAuvz6/RCFm7NOfzjCj7tkP4hJTn bsVBckU1Q==; Received: from [10.9.9.129] (helo=rmmprod07.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1eri3R-0004lr-Oc for guix-patches@gnu.org; Fri, 02 Mar 2018 11:36:45 +0100 Received: from mail by rmmprod07.runbox with local (Exim 4.86_2) (envelope-from ) id 1eri3R-0007Eo-NL for guix-patches@gnu.org; Fri, 02 Mar 2018 11:36:45 +0100 MIME-Version: 1.0 Received: from [Authenticated user (850733)] by runbox.com with http (RMM6); for ; Fri, 02 Mar 2018 10:36:45 GMT From: To: "guix-patches" Subject: [PATCH] Update VLC to 3.0.1 (Fixed submission - second try) Date: Fri, 02 Mar 2018 10:36:45 +0000 (GMT) X-Mailer: RMM6 Content-Type: multipart/mixed; boundary="----------=_1519987005-14342-42" Message-Id: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -2.8 (--) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Fri, 02 Mar 2018 11:28:14 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.8 (---) This is a multi-part message in MIME format... ------------=_1519987005-14342-42 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The uploaded attachment was empty >.< Now I've uploaded it properly. ----- Start Forwarded Message ----- Sent: Fri, 02 Mar 2018 10:32:56 +0000 (GMT) From: To: "guix-patches" Subject: [PATCH] Update VLC to 3.0.1 (Fixed submission) My original patch submission (from email address miles.harvey@runbox.com) g= ot butchered by my email client, so I have instead uploaded it as an attach= ment. ----- End Forwarded Message ----- ------------=_1519987005-14342-42 Content-Type: text/x-patch; name="=?UTF-8?Q?vlc-update.patch?=" Content-Disposition: attachment; filename="=?UTF-8?Q?vlc-update.patch?=" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy92aWRlby5zY20gYi9nbnUvcGFj a2FnZXMvdmlkZW8uc2NtCmluZGV4IDgxOTBiMGZmYy4uZDY2OGQ4MjM1IDEw MDY0NAotLS0gYS9nbnUvcGFja2FnZXMvdmlkZW8uc2NtCisrKyBiL2dudS9w YWNrYWdlcy92aWRlby5zY20KQEAgLTUzLDcgKzUzLDYgQEAKICAgIzp1c2Ut bW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSBnbnUpCiAgICM6dXNlLW1vZHVs ZSAoZ3VpeCBidWlsZC1zeXN0ZW0gZ2xpYi1vci1ndGspCiAgICM6dXNlLW1v ZHVsZSAoZ3VpeCBidWlsZC1zeXN0ZW0gbWVzb24pCi0gICM6dXNlLW1vZHVs ZSAoZ3VpeCBidWlsZC1zeXN0ZW0gcGVybCkKICAgIzp1c2UtbW9kdWxlIChn dWl4IGJ1aWxkLXN5c3RlbSBweXRob24pCiAgICM6dXNlLW1vZHVsZSAoZ3Vp eCBidWlsZC1zeXN0ZW0gd2FmKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcykKQEAgLTYxLDYgKzYwLDcgQEAKICAgIzp1c2UtbW9kdWxlIChnbnUg cGFja2FnZXMgYXVkaW8pCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2Vz IGF1dG90b29scykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgYXZh aGkpCisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGJhY2t1cCkKICAg Izp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgYmFzZSkKICAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMgYmlzb24pCiAgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzIGJvb3N0KQpAQCAtODksMTAgKzg5LDEyIEBACiAgICM6dXNl LW1vZHVsZSAoZ251IHBhY2thZ2VzIGdudXBnKQogICAjOnVzZS1tb2R1bGUg KGdudSBwYWNrYWdlcyBnc3RyZWFtZXIpCiAgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzIGd0aykKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMg Z2NjKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBpbWFnZSkKICAg Izp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgaW1hZ2VtYWdpY2spCiAgICM6 dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGlzby1jb2RlcykKICAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgbGlicmVvZmZpY2UpCisgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIGxpYnVzYikKICAgIzp1c2UtbW9kdWxlIChn bnUgcGFja2FnZXMgbGludXgpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIGx1YSkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgbTQpCkBA IC0xMDMsMTIgKzEwNSwxNCBAQAogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBwZXJsKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwa2ct Y29uZmlnKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwb3B0KQor ICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwcm90b2J1ZikKICAgIzp1 c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcHVsc2VhdWRpbykKICAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgcHl0aG9uKQogICAjOnVzZS1tb2R1bGUg KGdudSBwYWNrYWdlcyBweXRob24tY3J5cHRvKQogICAjOnVzZS1tb2R1bGUg KGdudSBwYWNrYWdlcyBweXRob24td2ViKQogICAjOnVzZS1tb2R1bGUgKGdu dSBwYWNrYWdlcyBxdCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMg cnVieSkKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgc2FtYmEpCiAg ICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHNkbCkKICAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMgc2VyaWFsaXphdGlvbikKICAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMgc2hlbGxzKQpAQCAtMTE2LDYgKzEyMCw3IEBA CiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHRleGluZm8pCiAgICM6 dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHRleHR1dGlscykKICAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgdGxzKQorICAjOnVzZS1tb2R1bGUgKGdu dSBwYWNrYWdlcyB1cG5wKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdl cyB2ZXJzaW9uLWNvbnRyb2wpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIHZ1bGthbikKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgd2Vi KQpAQCAtODEwLDcgKzgxNSw3IEBAIGF1ZGlvL3ZpZGVvIGNvZGVjIGxpYnJh cnkuIikKIChkZWZpbmUtcHVibGljIHZsYwogICAocGFja2FnZQogICAgIChu YW1lICJ2bGMiKQotICAgICh2ZXJzaW9uICIyLjIuOCIpCisgICAgKHZlcnNp b24gIjMuMC4xIikKICAgICAoc291cmNlIChvcmlnaW4KICAgICAgICAgICAg ICAobWV0aG9kIHVybC1mZXRjaCkKICAgICAgICAgICAgICAodXJpIChzdHJp bmctYXBwZW5kCkBAIC04MTgsMTAgKzgyMywxMSBAQCBhdWRpby92aWRlbyBj b2RlYyBsaWJyYXJ5LiIpCiAgICAgICAgICAgICAgICAgICAgdmVyc2lvbiAi L3ZsYy0iIHZlcnNpb24gIi50YXIueHoiKSkKICAgICAgICAgICAgICAoc2hh MjU2CiAgICAgICAgICAgICAgIChiYXNlMzIKLSAgICAgICAgICAgICAgICIx djMyc253NDZya2diZHFkeTNkc3NsMnkxM2k4cDJjcjFjdzFpMThyNnZkbWl5 MjRkdzR2IikpKSkKKyAgICAgICAgICAgICAgICIwMDhrcmZoeWttOTQ0N3dj MWtrdzgyYnN3M2Y2aWtsamdycXliMXNpbndseG5rZ2hxdzZmIikpKSkKICAg ICAoYnVpbGQtc3lzdGVtIGdudS1idWlsZC1zeXN0ZW0pCiAgICAgKG5hdGl2 ZS1pbnB1dHMKICAgICAgYCgoImdpdCIgLGdpdCkgOyBuZWVkZWQgZm9yIGEg dGVzdAorICAgICAgICgiZ2NjIiAsZ2NjKQogICAgICAgICgicGtnLWNvbmZp ZyIgLHBrZy1jb25maWcpKSkKICAgICA7OyBGSVhNRTogQWRkIG9wdGlvbmFs IGlucHV0cyBvbmNlIGF2YWlsYWJsZS4KICAgICAoaW5wdXRzCkBAIC04Mjks NyArODM1LDcgQEAgYXVkaW8vdmlkZW8gY29kZWMgbGlicmFyeS4iKQogICAg ICAgICgiYXZhaGkiICxhdmFoaSkKICAgICAgICAoImRidXMiICxkYnVzKQog ICAgICAgICgiZmxhYyIgLGZsYWMpCi0gICAgICAgKCJmZm1wZWciICxmZm1w ZWctMi44KSAgICAgICAgICAgICAgIDtmYWlscyB0byBidWlsZCBhZ2FpbnN0 IGZmbXBlZyAzLjAKKyAgICAgICAoImZmbXBlZyIgLGZmbXBlZykKICAgICAg ICAoImZvbnRjb25maWciICxmb250Y29uZmlnKQogICAgICAgICgiZnJlZXR5 cGUiICxmcmVldHlwZSkKICAgICAgICAoImdudXRscyIgLGdudXRscykKQEAg LTg1NywxNiArODYzLDU0IEBAIGF1ZGlvL3ZpZGVvIGNvZGVjIGxpYnJhcnku IikKICAgICAgICAoInBlcmwiICxwZXJsKQogICAgICAgICgicHVsc2VhdWRp byIgLHB1bHNlYXVkaW8pCiAgICAgICAgKCJweXRob24iICxweXRob24td3Jh cHBlcikKLSAgICAgICAoInF0YmFzZSIgLHF0YmFzZSkKKyAgICAgICA7OyBR dCByZXF1aXJlZCBpbnN0ZWFkIG9mIGp1c3QgcXRiYXNlIGFzIGl0IHdhcwor ICAgICAgIDs7IGJlZm9yZSwgb3RoZXJ3aXNlIGNoZWNrX1BPVEZJTEVTLnNo IHRlc3QgZmFpbHMuCisgICAgICAgKCJxdCIgLHF0KSAKICAgICAgICAoInF0 eDExZXh0cmFzIiAscXR4MTFleHRyYXMpCiAgICAgICAgKCJzZGwiICxzZGwp CiAgICAgICAgKCJzZGwtaW1hZ2UiICxzZGwtaW1hZ2UpCiAgICAgICAgKCJz cGVleCIgLHNwZWV4KQogICAgICAgICgieDI2NSIgLHgyNjUpCi0gICAgICAg KCJ4Y2ItdXRpbC1rZXlzeW1zIiAseGNiLXV0aWwta2V5c3ltcykpKQorICAg ICAgICgieGNiLXV0aWwta2V5c3ltcyIgLHhjYi11dGlsLWtleXN5bXMpCisg ICAgICAgO09wdGlvbmFsIGlucHV0cworICAgICAgIDsoImx1YSIgLGx1YSkg O0NvbmZpZ3VyZSBwaGFzZSBkb2Vzbid0IGZpbmQgdGhpcworICAgICAgICgi bGliYXJjaGl2ZSIgLGxpYmFyY2hpdmUpCisgICAgICAgKCJsaXZlbWVkaWEt dXRpbHMiICxsaXZlbWVkaWEtdXRpbHMpCisgICAgICAgKCJsaWJibHVyYXki ICxsaWJibHVyYXkpCisgICAgICAgKCJzYW1iYSIgLHNhbWJhKQorICAgICAg IDsoIm5mcy11dGlscyIgLChAIChnbnUgcGFja2FnZXMgbmZzKSBuZnMtdXRp bHMpKSA7Y29uZmlndXJlIHBoYXNlIGRvZXNuJ3QgZmluZCB0aGlzCisgICAg ICAgOygiZnJlZXJkcCIgLChAIChnbnUgcGFja2FnZXMgcmRlc2t0b3ApIGZy ZWVyZHApKSA7Y2F1c2VzIGNvbXBpbGF0aW9uIGZhaWx1cmUKKyAgICAgICAo ImxpYnNob3V0IiAsbGlic2hvdXQpCisgICAgICAgKCJsaWJlYm1sIiAsbGli ZWJtbCkKKyAgICAgICAoImxpYm1hdHJvc2thIiAsbGlibWF0cm9za2EpCisg ICAgICAgKCJsaWJtb2RwbHVnIiAsbGlibW9kcGx1ZykKKyAgICAgICAoIm1w ZzEyMyIgLG1wZzEyMykKKyAgICAgICA7KCJnc3RyZWFtZXIiCisgICAgICAg OyAsKEAgKGdudSBwYWNrYWdlcyBnc3RyZWFtZXIpIGdzdHJlYW1lcikpIDtj b25maWd1cmUgcGhhc2UgZG9lc24ndCBmaW5kIHRoaXMuCisgICAgICAgKCJs aWJ2YSIgLGxpYnZhKQorICAgICAgICgidHdvbGFtZSIgLHR3b2xhbWUpCisg ICAgICAgKCJsaWJkY2EiICxsaWJkY2EpCisgICAgICAgKCJsaWJtcGVnMiIg LGxpYm1wZWcyKQorICAgICAgICgic3BlZXhkc3AiICxzcGVleGRzcCkKKyAg ICAgICAoImZsdWlkc3ludGgiICxmbHVpZHN5bnRoKQorICAgICAgICgibGli YXNzIiAsbGliYXNzKQorICAgICAgICgiZnJpYmlkaSIgLGZyaWJpZGkpCisg ICAgICAgKCJsaWJyc3ZnIiAsbGlicnN2ZykKKyAgICAgICAoImxpYmNhY2Ei ICxsaWJjYWNhKQorICAgICAgICgiamFjayIgLGphY2stMSkKKyAgICAgICAo InNveHIiICxzb3hyKQorICAgICAgICgiY2hyb21hcHJpbnQiICxjaHJvbWFw cmludCkKKyAgICAgICAoInByb3RvYnVmIiAscHJvdG9idWYpCisgICAgICAg KCJldWRldiIgLGV1ZGV2KQorICAgICAgICgibGlibXRwIiAsbGlibXRwKQor ICAgICAgICgibGlidXBucCIgLGxpYnVwbnApCisgICAgICAgKCJ0YWdsaWIi ICx0YWdsaWIpCisgICAgICAgKCJsaWJzZWNyZXQiICxsaWJzZWNyZXQpCisg ICAgICAgKCJsaWJub3RpZnkiICxsaWJub3RpZnkpKSkKICAgICAoYXJndW1l bnRzCiAgICAgIGAoIzpjb25maWd1cmUtZmxhZ3MKICAgICAgICBgKCJDWFhG TEFHUz0tc3RkPWdudSsrMTEiCisgICAgICAgICAiQlVJTERDQz1nY2MiCiAg ICAgICAgICAsKHN0cmluZy1hcHBlbmQgIkxERkxBR1M9LVdsLC1ycGF0aCAt V2wsIgogICAgICAgICAgICAgICAgICAgICAgICAgIChhc3NvYy1yZWYgJWJ1 aWxkLWlucHV0cyAiZmZtcGVnIikKICAgICAgICAgICAgICAgICAgICAgICAg ICAiL2xpYiIpKSAgICAgICAgICAgICAgICAgO25lZWRlZCBmb3IgdGhlIHRl c3RzCkBAIC04ODMsMTAgKzkyNywxMiBAQCBhdWRpby92aWRlbyBjb2RlYyBs aWJyYXJ5LiIpCiAgICAgICAgICAgICAgICA7OyB3aGljaCBmYWlscyBpbiBv dXIgc2FuZGJveGVkIGJ1aWxkIHN5c3RlbQogICAgICAgICAgICAgICAgKHN1 YnN0aXR1dGUqICJ0ZXN0L3J1bl92bGMuc2giCiAgICAgICAgICAgICAgICAg ICgoIi4vdmxjIC0taWdub3JlLWNvbmZpZyIpICJlY2hvIikpCi0gICAgICAg ICAgICAgICA7OyBYWFggTGlrZWx5IG5vdCBuZWVkZWQgZm9yID4yLjIuNi4K LSAgICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAibW9kdWxlcy9ndWkvcXQ0 L2NvbXBvbmVudHMvaW50ZXJmYWNlX3dpZGdldHMuY3BwIgotICAgICAgICAg ICAgICAgICAoKCI8cXgxMWluZm9feDExLmg+IikgIjxRdFgxMUV4dHJhcy9x eDExaW5mb194MTEuaD4iKSkKICAgICAgICAgICAgICAgICN0KSkpCisgICAg ICAgICAoYWRkLWFmdGVyICdidWlsZCAnZml4LW1pc25hbWVkLWFwcGRhdGEK KyAgICAgICAgICAgOzsgdmxjLmFwcGRhdGEueG1sLmluIGdldHMgY3JlYXRl ZCBpbnN0ZWFkIG9mIHZsYy5hcHBkYXRhLnhtbCwgc28KKwkgICA7OyB3ZSBj b3B5IGl0IHRvIHRoZSBjb3JyZWN0IG5hbWUgLSBUaGlzIHNvbHV0aW9uIGlz IGhhY2t5LCBpZiB0aGUKKwkgICA7OyByb290IGNhdXNlIGlzIGZvdW5kIHRo ZW4gcGxlYXNlIHN1cHBseSBhIHBhdGNoLgorICAgICAgICAgICAobGFtYmRh IF8gKGNvcHktZmlsZSAic2hhcmUvdmxjLmFwcGRhdGEueG1sLmluIiAic2hh cmUvdmxjLmFwcGRhdGEueG1sIikpKQogICAgICAgICAgKGFkZC1hZnRlciAn aW5zdGFsbCAncmVnZW5lcmF0ZS1wbHVnaW4tY2FjaGUKICAgICAgICAgICAg KGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQog ICAgICAgICAgICAgIDs7IFRoZSAnaW5zdGFsbC1leGVjLWhvb2snIHJ1bGUg aW4gdGhlIHRvcC1sZXZlbCBNYWtlZmlsZS5hbQo= ------------=_1519987005-14342-42-- ------------=_1535576222-18975-3--