From patchwork Sat Oct 2 20:31:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 33583 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8D27527BBE3; Sat, 2 Oct 2021 21:34:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0A02527BBE1 for ; Sat, 2 Oct 2021 21:34:02 +0100 (BST) Received: from localhost ([::1]:59662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWlhp-00020n-0F for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 16:34:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWlfu-0007ZQ-Ad for guix-patches@gnu.org; Sat, 02 Oct 2021 16:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49153) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWlfu-0001Eq-0T for guix-patches@gnu.org; Sat, 02 Oct 2021 16:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWlft-0001zW-UF for guix-patches@gnu.org; Sat, 02 Oct 2021 16:32:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50652] [PATCH] gnu: Add mjpg-streamer. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Oct 2021 20:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50652 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: "50652@debbugs.gnu.org" <50652@debbugs.gnu.org> Received: via spool by 50652-submit@debbugs.gnu.org id=B50652.16332066907617 (code B ref 50652); Sat, 02 Oct 2021 20:32:01 +0000 Received: (at 50652) by debbugs.gnu.org; 2 Oct 2021 20:31:30 +0000 Received: from localhost ([127.0.0.1]:60699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWlfO-0001yl-85 for submit@debbugs.gnu.org; Sat, 02 Oct 2021 16:31:30 -0400 Received: from mail-4317.protonmail.ch ([185.70.43.17]:36223) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWlfM-0001yY-77 for 50652@debbugs.gnu.org; Sat, 02 Oct 2021 16:31:28 -0400 Date: Sat, 02 Oct 2021 20:31:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1633206681; bh=zAk9V0MiVSgVOzYaZHVNDKbjkF3Z0tp+Otx3x2rea5k=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=DQB7HEhVfFSGXAVhRFfZfrny+TYB/KGfaFIUtQshNnxiXnbmxdk5azJ/eDQ0Hf0ma /+TanvMp0lWImKWc7aIFFUAOUm9QmD4CI4lPosqHI3jV5vq8U41MrJpAriFPq8yG2w vKWjW2L60vW2zK3l4niPhkG2miMpKKMWO4jKu0lk= Message-ID: In-Reply-To: <87lf3d223f.fsf_-_@gnu.org> References: <87lf3d223f.fsf_-_@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi Ludo, thanks for the review. The jar and JQuery files are now removed. The website is still running and the streaming in web browser works (ungoogled-chromium, version: 93.0.4577.82-0.3f62dbc). The rest of the files are should be fine as they are not binaries not minifed versions. --8<---------------cut here---------------start------------->8--- * gnu/packages/video.scm: (mjpg-streamer): New variable. --- 2.32.0 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b6acebcecc..95e2f7e84e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -52,6 +52,7 @@ ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2020 Hartmut Goebel ;;; Copyright © 2021 Raghav Gururajan +;;; Copyright © 2021 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -446,6 +447,51 @@ library.") (home-page "http://libquicktime.sourceforge.net/") (license license:lgpl2.1+))) +(define-public mjpg-streamer + (package + (name "mjpg-streamer") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jacksonliam/mjpg-streamer") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0w81pg228154blzbzr590xwhcll9baxyqxl6wxrgqsi9cd7pzq23")) + (modules '((guix build utils))) + (snippet '(begin + (with-directory-excursion "mjpg-streamer-experimental/www" + (for-each delete-file-recursively + '("cambozola.jar" + "JQuerySpinBtn.css" + "JQuerySpinBtn.js" + "jquery.js" + "jquery.rotate.js" + "jquery.ui.core.min.js" + "jquery.ui.custom.css" + "jquery.ui.tabs.min.js" + "jquery.ui.widget.min.js")) + #t))))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda* _ + (chdir "mjpg-streamer-experimental")))))) + (inputs `(("libjpeg-turbo" ,libjpeg-turbo))) + (synopsis "Stream JPEG over IP network") + (description "Command line application that copies JPEG frames from one or +more input plugins to multiple output plugins. It can be used to stream JPEG +files over an IP-based network from a webcam to various types of viewers such +as Chrome, Firefox, Cambozola, VLC, mplayer, and other software capable of +receiving MJPG streams.") + (home-page "https://github.com/jacksonliam/mjpg-streamer") + (license license:gpl2+))) + (define-public mjpegtools (package (name "mjpegtools")