* [PATCHES] Various
@ 2015-03-07 18:24 Taylan Ulrich Bayırlı/Kammer
2015-03-09 9:14 ` Ludovic Courtès
0 siblings, 1 reply; 16+ messages in thread
From: Taylan Ulrich Bayırlı/Kammer @ 2015-03-07 18:24 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 712 bytes --]
Tracking the dependency DAG of mplayer2 lead to a big series of patches.
These are the fairly simple first 21 out of a total 25. I will push
them in let's say two days if nobody has comments.
5 of the patches do something else than adding a package:
- openal has been moved from games to audio,
- freeglut now propagates input glu,
- cdio had a misleading description claiming it includes pycdio and
libcdio-paranoia, when it doesn't; it's now fixed,
- ffmpeg got three more optional inputs that were already packaged,
- ffmpeg now builds with libavresample support.
Moreover, a handful of the package-adding patches also add the added
package as an additional optional input to ffmpeg.
The patches:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-faad2.patch --]
[-- Type: text/x-diff, Size: 1960 bytes --]
From 901cc6056e3b30e79cbb48aedaddfaa1c7548977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Thu, 5 Mar 2015 15:46:14 +0100
Subject: [PATCH 01/25] gnu: Add faad2.
* gnu/packages/audio.scm (faad2): New variable.
---
gnu/packages/audio.scm | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 64bde2e..98794ae 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -50,6 +50,7 @@
#:use-module (gnu packages readline)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
+ #:use-module (gnu packages zip)
#:use-module (srfi srfi-1))
(define-public alsa-modular-synth
@@ -277,6 +278,38 @@ plugins are provided.")
ALSA PCM devices.")
(license license:gpl2+)))
+(define-public faad2
+ (package
+ (name "faad2")
+ (version "2.7")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://sourceforge/faac/faad2-" version ".zip"))
+ (sha256
+ (base32
+ "16f3l16c00sg0wkrkm3vzv0gy3g97x309vw788igs0cap2x1ak3z"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("unzip" ,unzip)))
+ (arguments
+ '(#:phases
+ (alist-cons-after
+ 'unpack 'bootstrap
+ (lambda _
+ (substitute* "bootstrap" (("\r\n") "\n"))
+ (zero? (system* "sh" "bootstrap")))
+ %standard-phases)))
+ (home-page "http://www.audiocoding.com/faad2.html")
+ (synopsis "MPEG-4 and MPEG-2 AAC decoder")
+ (description
+ "FAAD2 is an MPEG-4 and MPEG-2 AAC decoder supporting LC, Main, LTP, SBR,
+PS, and DAB+.")
+ (license license:gpl2)))
+
(define-public freepats
(package
(name "freepats")
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Add-libbs2b.patch --]
[-- Type: text/x-diff, Size: 1667 bytes --]
From 1dac30a8adef24a598a4dec73e6f07feac273c3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Thu, 5 Mar 2015 15:45:35 +0100
Subject: [PATCH 02/25] gnu: Add libbs2b.
* gnu/packages/audio.scm (libbs2b): New variable.
---
gnu/packages/audio.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 98794ae..6e8e2e3 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -524,6 +524,29 @@ applications, restoring program state (i.e. loaded patches) and the
connections between them.")
(license license:gpl2+)))
+(define-public libbs2b
+ (package
+ (name "libbs2b")
+ (version "3.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://sourceforge/bs2b/libbs2b-" version ".tar.lzma"))
+ (sha256
+ (base32
+ "1mcc4gjkmphczjybnsrip3gq1f974knzys7x49bv197xk3fn8wdr"))))
+ (build-system gnu-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs `(("libsndfile" ,libsndfile)))
+ (home-page "http://sourceforge.net/projects/bs2b/")
+ (synopsis "Bauer stereophonic-to-binaural DSP")
+ (description
+ "The Bauer stereophonic-to-binaural DSP (bs2b) library and plugins is
+designed to improve headphone listening of stereo audio records. Recommended
+for headphone prolonged listening to disable superstereo fatigue without
+essential distortions.")
+ (license license:expat)))
+
(define-public liblo
(package
(name "liblo")
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-Move-openal-to-gnu-packages-audio.patch --]
[-- Type: text/x-diff, Size: 3874 bytes --]
From ed2850fc2a6198fb6c37efe9938380a0ed3389af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Thu, 5 Mar 2015 19:51:02 +0100
Subject: [PATCH 03/25] gnu: Move 'openal' to (gnu packages audio).
* gnu/packages/games.scm (openal): Removed variable.
* gnu/packages/audio.scm (openal): New variable.
---
gnu/packages/audio.scm | 29 +++++++++++++++++++++++++++++
gnu/packages/games.scm | 30 +-----------------------------
2 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 6e8e2e3..e9e924a 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -713,6 +713,35 @@ extensions into easy to use C++ classes. It is the successor of
lv2-c++-tools.")
(license license:gpl3+)))
+(define-public openal
+ (package
+ (name "openal")
+ (version "1.15.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://kcat.strangesoft.net/openal-releases/openal-soft-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "0mmhdqiyb3c9dzvxspm8h2v8jibhi8pfjxnf6m0wn744y1ia2a8f"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f)) ; no check target
+ (inputs
+ `(("alsa-lib" ,alsa-lib)
+ ("pulseaudio" ,pulseaudio)))
+ (synopsis "3D audio API")
+ (description
+ "OpenAL provides capabilities for playing audio in a virtual 3D
+environment. Distance attenuation, doppler shift, and directional sound
+emitters are among the features handled by the API. More advanced effects,
+including air absorption, occlusion, and environmental reverb, are available
+through the EFX extension. It also facilitates streaming audio, multi-channel
+buffers, and audio capture.")
+ (home-page "http://kcat.strangesoft.net/openal.html")
+ (license license:lgpl2.0+)))
+
(define-public patchage
(package
(name "patchage")
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 9c02d88..ff3239a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -33,6 +33,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages admin)
+ #:use-module (gnu packages audio)
#:use-module (gnu packages boost)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gl)
@@ -512,35 +513,6 @@ alternative layouts Dvorak and Colemak, as well as for the numpad. Tutorials
are primarily in English, however some in other languages are provided.")
(license license:gpl3+)))
-(define-public openal
- (package
- (name "openal")
- (version "1.15.1")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "http://kcat.strangesoft.net/openal-releases/openal-soft-"
- version ".tar.bz2"))
- (sha256
- (base32
- "0mmhdqiyb3c9dzvxspm8h2v8jibhi8pfjxnf6m0wn744y1ia2a8f"))))
- (build-system cmake-build-system)
- (arguments
- `(#:tests? #f)) ; no check target
- (inputs
- `(("alsa-lib" ,alsa-lib)
- ("pulseaudio" ,pulseaudio)))
- (synopsis "3D audio API")
- (description
- "OpenAL provides capabilities for playing audio in a virtual 3D
-environment. Distance attenuation, doppler shift, and directional sound
-emitters are among the features handled by the API. More advanced effects,
-including air absorption, occlusion, and environmental reverb, are available
-through the EFX extension. It also facilitates streaming audio, multi-channel
-buffers, and audio capture.")
- (home-page "http://kcat.strangesoft.net/openal.html")
- (license license:lgpl2.0+)))
-
(define-public irrlicht
(package
(name "irrlicht")
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0004-gnu-Add-rsound.patch --]
[-- Type: text/x-diff, Size: 2117 bytes --]
From f11f61ed07cd5a5f08aa8921f6c1f791ef5c7af6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Thu, 5 Mar 2015 19:52:26 +0100
Subject: [PATCH 04/25] gnu: Add rsound.
* gnu/packages/audio.scm (rsound): New variable.
---
gnu/packages/audio.scm | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e9e924a..e44db11 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1105,6 +1105,46 @@ to record and/or play sound using a callback function or a blocking read/write
interface.")
(license license:expat)))
+(define-public rsound
+ (package
+ (name "rsound")
+ (version "1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/Themaister/RSound/archive/v"
+ version ".tar.gz"))
+ (sha256
+ (base32 "1wzs40c0k5zpkmm5ffl6c17xmr399sxli7ys0fbb9ib0fd334knx"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("alsa-lib" ,alsa-lib)
+ ("jack" ,jack-2)
+ ("ao" ,ao)
+ ("libsamplerate" ,libsamplerate)
+ ("openal" ,openal)
+ ("portaudio" ,portaudio)
+ ("pulseaudio" ,pulseaudio)))
+ (arguments
+ '(#:phases
+ (alist-replace
+ 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (setenv "CC" "gcc")
+ (zero?
+ (system* "./configure"
+ (string-append "--prefix=" (assoc-ref outputs "out")))))
+ %standard-phases)
+ ;; No 'check' target.
+ #:tests? #f))
+ (home-page "http://themaister.net/rsound.html")
+ (synopsis "Networked audio system")
+ (description
+ "RSound allows you to send audio from an application and transfer it
+directly to a different computer on your LAN network. It is an audio daemon
+with a much different focus than most other audio daemons.")
+ (license license:gpl3+)))
+
(define-public zita-alsa-pcmi
(package
(name "zita-alsa-pcmi")
--
2.2.1
[-- Attachment #6: 0005-gnu-Add-libungif.patch --]
[-- Type: text/x-diff, Size: 1822 bytes --]
From 430f5c14bf2d40c2cb6dfd5ca7b01af4467361eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Thu, 5 Mar 2015 15:45:01 +0100
Subject: [PATCH 05/25] gnu: Add libungif.
* gnu/packages/image.scm (libungif): New variable.
---
gnu/packages/image.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 46b0824..8d4b6fc 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
;;; Copyright © 2014 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -294,6 +295,25 @@ compose, and analyze GIF images.")
(home-page "http://giflib.sourceforge.net/")
(license license:x11)))
+(define-public libungif
+ (package
+ (name "libungif")
+ (version "4.1.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/giflib/libungif-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "0cnksimmmjngdrys302ik1385sg1sj4i0gxivzldhgwd46n7x2kh"))))
+ (build-system gnu-build-system)
+ (inputs `(("perl" ,perl))) ;package ships some perl tools
+ (home-page "http://giflib.sourceforge.net/")
+ (synopsis "GIF decompression library")
+ (description
+ "libungif is the old GIF decompression library by the GIFLIB project.")
+ (license license:expat)))
+
(define-public imlib2
(package
(name "imlib2")
--
2.2.1
[-- Attachment #7: 0006-gnu-Add-liba52.patch --]
[-- Type: text/x-diff, Size: 1801 bytes --]
From 2b956d6d09d90bd746d89827c57bcab8537ba7d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Fri, 6 Mar 2015 10:17:19 +0100
Subject: [PATCH 06/25] gnu: Add liba52.
* gnu/packages/video.scm (liba52): New variable.
---
gnu/packages/video.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 87d9824..67998cf 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -63,6 +64,25 @@
#:use-module (gnu packages yasm)
#:use-module (gnu packages zip))
+(define-public liba52
+ (package
+ (name "liba52")
+ (version "0.7.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/liba52/a52dec-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2"))))
+ (build-system gnu-build-system)
+ (home-page "http://liba52.sourceforge.net/")
+ (synopsis "ATSC A/52 stream decoder")
+ (description "liba52 is a library for decoding ATSC A/52 streams. The
+A/52 standard is used in a variety of applications, including digital
+television and DVD. It is also known as AC-3.")
+ (license gpl2+)))
+
(define-public ffmpeg
(package
(name "ffmpeg")
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #8: 0007-gnu-Add-libdca.patch --]
[-- Type: text/x-diff, Size: 1444 bytes --]
From 9decb0e315152a7bcdbcb2bda0be96715f93348b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Fri, 6 Mar 2015 10:17:35 +0100
Subject: [PATCH 07/25] gnu: Add libdca.
* gnu/packages/video.scm (libdca): New variable.
---
gnu/packages/video.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 67998cf..b825ddb 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -83,6 +83,25 @@ A/52 standard is used in a variety of applications, including digital
television and DVD. It is also known as AC-3.")
(license gpl2+)))
+(define-public libdca
+ (package
+ (name "libdca")
+ (version "0.0.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://download.videolan.org/pub/videolan/libdca/"
+ version "/libdca-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "0hh6a7l8vvccsd5i1fkv9av2gzv9fy8m0b8jpsn5p6hh4bh2586v"))))
+ (build-system gnu-build-system)
+ (home-page "http://www.videolan.org/developers/libdca.html")
+ (synopsis "DTS Coherent Acoustics decoder")
+ (description "libdca is a library for decoding DTS Coherent Acoustics
+streams.")
+ (license gpl2+)))
+
(define-public ffmpeg
(package
(name "ffmpeg")
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #9: 0008-gnu-Add-libdv.patch --]
[-- Type: text/x-diff, Size: 1644 bytes --]
From 24bd9b5c5dd2baeab39209d251a3022c130f00ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Fri, 6 Mar 2015 11:50:14 +0100
Subject: [PATCH 08/25] gnu: Add libdv.
* gnu/packages/video.scm (libdv): New variable.
---
gnu/packages/video.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index b825ddb..aa06ebe 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -102,6 +102,29 @@ television and DVD. It is also known as AC-3.")
streams.")
(license gpl2+)))
+(define-public libdv
+ (package
+ (name "libdv")
+ (version "1.0.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://sourceforge/libdv/libdv-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3"))))
+ (build-system gnu-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs `(("libxv" ,libxv)))
+ (home-page "http://libdv.sourceforge.net/")
+ (synopsis "DV video (IEC 61834 and SMPTE 314M) codec")
+ (description "The Quasar DV codec (libdv) is a software codec for DV
+video, the encoding format used by most digital camcorders, typically those
+that support the IEEE 1394 (a.k.a. FireWire or i.Link) interface. Libdv was
+developed according to the official standards for DV video: IEC 61834 and
+SMPTE 314M.")
+ (license lgpl2.1+)))
+
(define-public ffmpeg
(package
(name "ffmpeg")
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #10: 0009-gnu-Add-libbluray.patch --]
[-- Type: text/x-diff, Size: 3907 bytes --]
From b576d1acf2b60a415cfedcc3ecff7e2f0a2969fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Thu, 5 Mar 2015 21:40:36 +0100
Subject: [PATCH 09/25] gnu: Add libbluray.
* gnu/packages/video.scm (libbluray): New variable.
(ffmpeg): Add input libbluray.
---
gnu/packages/video.scm | 35 +++++++++++++++++++++++++++++++++--
1 file changed, 33 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index aa06ebe..1dcfa80 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -22,7 +22,7 @@
(define-module (gnu packages video)
#:use-module (ice-9 match)
#:use-module ((guix licenses)
- #:select (gpl2 gpl2+ gpl3+ bsd-3 public-domain))
+ #:select (gpl2 gpl2+ gpl3+ lgpl2.1+ bsd-3 public-domain))
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system cmake)
@@ -35,6 +35,7 @@
#:use-module (gnu packages cdrom)
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
+ #:use-module (gnu packages doxygen)
#:use-module (gnu packages elf)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages fribidi)
@@ -57,6 +58,7 @@
#:use-module (gnu packages qt)
#:use-module (gnu packages sdl)
#:use-module (gnu packages ssh)
+ #:use-module (gnu packages texlive)
#:use-module (gnu packages version-control)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
@@ -142,6 +144,7 @@ SMPTE 314M.")
("freetype" ,freetype)
("opus" ,opus)
("lame" ,lame)
+ ("libbluray" ,libbluray)
("libtheora" ,libtheora)
("libvorbis" ,libvorbis)
("libvpx" ,libvpx)
@@ -184,7 +187,6 @@ SMPTE 314M.")
;; --enable-ladspa enable LADSPA audio filtering
;; --enable-libaacplus enable AAC+ encoding via libaacplus [no]
;; --enable-libass enable libass subtitles rendering [no]
-;; --enable-libbluray enable BluRay reading using libbluray [no]
;; --enable-libcaca enable textual display using libcaca
;; --enable-libcelt enable CELT decoding via libcelt [no]
;; --enable-libcdio enable audio CD grabbing with libcdio
@@ -234,6 +236,7 @@ SMPTE 314M.")
"--enable-shared"
"--enable-fontconfig"
;; "--enable-gnutls" ; causes test failures
+ "--enable-libbluray"
"--enable-libfreetype"
"--enable-libmp3lame"
"--enable-libopus"
@@ -508,6 +511,34 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
YouTube.com and a few more sites.")
(license public-domain)))
+(define-public libbluray
+ (package
+ (name "libbluray")
+ (version "0.7.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://download.videolan.org/videolan/"
+ name "/" version "/"
+ name "-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "13dngs4b4cv29f6b825dq14n77mfhvk1kjb42axpq494pfgyp6zp"))))
+ (build-system gnu-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("doxygen" ,doxygen)
+ ("fontconfig" ,fontconfig)
+ ("freetype" ,freetype)
+ ("libxml2" ,libxml2)
+ ("perl" ,perl) ;for doxygen
+ ("texlive" ,texlive)))
+ (home-page "http://www.videolan.org/developers/libbluray.html")
+ (synopsis "Blu-Ray Disc playback library")
+ (description
+ "libbluray is a library designed for Blu-Ray Disc playback for media
+players, like VLC or MPlayer.")
+ (license lgpl2.1+)))
+
(define-public libdvdread
(package
(name "libdvdread")
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #11: 0010-gnu-Add-libdvdcss.patch --]
[-- Type: text/x-diff, Size: 1532 bytes --]
From 802431da2622a7fa1edbadb9ab87c89fcf8eb9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Fri, 6 Mar 2015 10:39:10 +0100
Subject: [PATCH 10/25] gnu: Add libdvdcss.
* gnu/packages/video.scm (libdvdcss): New variable.
---
gnu/packages/video.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 1dcfa80..670e731 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -594,6 +594,26 @@ DVD virtual machine and internal playback states are completely
encapsulated.")
(license gpl2+)))
+(define-public libdvdcss
+ (package
+ (name "libdvdcss")
+ (version "1.3.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://download.videolan.org/videolan/"
+ name "/" version "/"
+ name "-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "158k9zagmbk5bkbz96l6lwhh7xcgfcnzflkr4vblskhcab6llhbw"))))
+ (build-system gnu-build-system)
+ (home-page "http://www.videolan.org/developers/libdvdcss.html")
+ (synopsis "Library for accessing DVDs as block devices")
+ (description
+ "libdvdcss is a simple library designed for accessing DVDs like a block
+device without having to bother about the decryption.")
+ (license gpl2+)))
+
(define-public srt2vtt
(package
(name "srt2vtt")
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #12: 0011-gnu-Add-libdvdnav-4.patch --]
[-- Type: text/x-diff, Size: 1794 bytes --]
From 5a13889e84686db82a96a1baa3284bbf7d83c6e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Fri, 6 Mar 2015 17:07:55 +0100
Subject: [PATCH 11/25] gnu: Add libdvdnav-4.
* gnu/packages/video.scm (libdvdnav-4): New variable.
---
gnu/packages/video.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 670e731..ba6a48f 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -31,6 +31,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages audio)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages avahi)
#:use-module (gnu packages cdrom)
#:use-module (gnu packages compression)
@@ -594,6 +595,32 @@ DVD virtual machine and internal playback states are completely
encapsulated.")
(license gpl2+)))
+(define-public libdvdnav-4
+ (package
+ (inherit libdvdnav)
+ (version "4.2.1")
+ (source (origin
+ (method url-fetch)
+ (uri
+ (string-append
+ "http://download.videolan.org/videolan/libdvdnav/libdvdnav-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0wi3gy408c8xj0ism0hckv5jbfh3lg4pmgxv87gbch9jrhp2gjkz"))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)))
+ (arguments
+ '(#:phases
+ (alist-cons-after
+ 'unpack 'autoreconf
+ (lambda _
+ (zero? (system* "autoreconf" "-vif")))
+ %standard-phases)))))
+
(define-public libdvdcss
(package
(name "libdvdcss")
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #13: 0012-gnu-Add-xvid.patch --]
[-- Type: text/x-diff, Size: 3027 bytes --]
From 1e4844881037f20faf0e0515348b5f2e0d066548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Fri, 6 Mar 2015 11:50:40 +0100
Subject: [PATCH 12/25] gnu: Add xvid.
* gnu/packages/video.scm (xvid): New variable.
(ffmpeg): Add input xvid.
---
gnu/packages/video.scm | 37 +++++++++++++++++++++++++++++++++++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index ba6a48f..9d93301 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -153,6 +153,7 @@ SMPTE 314M.")
("soxr" ,soxr)
("speex" ,speex)
("twolame" ,twolame)
+ ("xvid" ,xvid)
("zlib", zlib)))
(native-inputs
`(("bc" ,bc)
@@ -223,8 +224,6 @@ SMPTE 314M.")
;; --enable-libwavpack enable wavpack encoding via libwavpack [no]
;; --enable-libx264 enable H.264 encoding via x264 [no]
;; --enable-libxavs enable AVS encoding via xavs [no]
-;; --enable-libxvid enable Xvid encoding via xvidcore,
-;; native MPEG-4/Xvid encoder exists [no]
;; --enable-libzmq enable message passing via libzmq [no]
;; --enable-libzvbi enable teletext support via libzvbi [no]
;; --enable-openal enable OpenAL 1.1 capture support [no]
@@ -247,6 +246,7 @@ SMPTE 314M.")
"--enable-libtwolame"
"--enable-libvorbis"
"--enable-libvpx"
+ "--enable-libxvid"
"--enable-runtime-cpudetect"
@@ -866,3 +866,36 @@ capabilities.")
(string-append out "/share/ADM_addons"))))
(alist-delete 'install
%standard-phases)))))))))
+
+(define-public xvid
+ (package
+ (name "xvid")
+ (version "1.3.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://downloads.xvid.org/downloads/xvidcore-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "0m5g75qvapr7xpywg6a83v5x19kw1nm9l2q48lg7jvvpba0bmqdh"))))
+ (build-system gnu-build-system)
+ (native-inputs `(("yasm" ,yasm)))
+ (arguments
+ '(#:phases
+ (alist-cons-before
+ 'configure 'pre-configure
+ (lambda _
+ (chdir "build/generic")
+ (substitute* "configure"
+ (("#! /bin/sh") (string-append "#!" (which "sh")))))
+ %standard-phases)
+ ;; No 'check' target.
+ #:tests? #f))
+ (home-page "https://www.xvid.com/")
+ (synopsis "MPEG-4 Part 2 Advanced Simple Profile video codec")
+ (description "Xvid is an MPEG-4 Part 2 Advanced Simple Profile (ASP) video
+codec library. It uses ASP features such as b-frames, global and quarter
+pixel motion compensation, lumi masking, trellis quantization, and H.263, MPEG
+and custom quantization matrices.")
+ (license gpl2+)))
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #14: 0013-gnu-freeglut-Propagate-input-glu.patch --]
[-- Type: text/x-diff, Size: 974 bytes --]
From 24d0bfedaae72f7b9216acf5c9a7c30a7bb73b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Thu, 5 Mar 2015 15:44:16 +0100
Subject: [PATCH 13/25] gnu: freeglut: Propagate input glu.
* gnu/packages/gl.scm (freeglut): Make glu a propagated input instead of a
normal input.
---
gnu/packages/gl.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 0eb2d26..7d549d3 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -82,8 +82,8 @@ as ASCII text.")
("libxrandr" ,libxrandr)
("libxxf86vm" ,libxxf86vm)
("inputproto" ,inputproto)
- ("xinput" ,xinput)
- ("glu" ,glu)))
+ ("xinput" ,xinput)))
+ (propagated-inputs `(("glu" ,glu)))
(home-page "http://freeglut.sourceforge.net/")
(synopsis "Alternative to the OpenGL Utility Toolkit (GLUT)")
(description
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #15: 0014-gnu-Add-libcaca.patch --]
[-- Type: text/x-diff, Size: 3697 bytes --]
From 74e069ffdb73505550555193e64e75800e8ace93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Thu, 5 Mar 2015 15:56:58 +0100
Subject: [PATCH 14/25] gnu: Add libcaca.
* gnu/packages/video.scm (libcaca): New variable.
(ffmpeg): Add input libcaca.
---
gnu/packages/video.scm | 35 +++++++++++++++++++++++++++++++++--
1 file changed, 33 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 9d93301..980c9ef 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -22,7 +22,8 @@
(define-module (gnu packages video)
#:use-module (ice-9 match)
#:use-module ((guix licenses)
- #:select (gpl2 gpl2+ gpl3+ lgpl2.1+ bsd-3 public-domain))
+ #:select (gpl2 gpl2+ gpl3+ lgpl2.1+ bsd-3 public-domain
+ fsf-free))
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system cmake)
@@ -51,6 +52,7 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
#:use-module (gnu packages mp3)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages openssl)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -86,6 +88,34 @@ A/52 standard is used in a variety of applications, including digital
television and DVD. It is also known as AC-3.")
(license gpl2+)))
+(define-public libcaca
+ (package
+ (name "libcaca")
+ (version "0.99.beta19")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://caca.zoy.org/files/libcaca/libcaca-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj"))))
+ (build-system gnu-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("freeglut" ,freeglut)
+ ("ftgl" ,ftgl)
+ ("libx11" ,libx11)
+ ("mesa" ,mesa)
+ ("ncurses" ,ncurses)
+ ("zlib" ,zlib)))
+ (home-page "http://caca.zoy.org/wiki/libcaca")
+ (synopsis "Colour ASCII-art library")
+ (description "libcaca is a graphics library that outputs text instead of
+pixels, so that it can work on older video cards or text terminals. It
+supports Unicode, 2048 colors, dithering of color images, and advanced text
+canvas operations.")
+ (license (fsf-free "file://COPYING")))) ;WTFPL version 2
+
(define-public libdca
(package
(name "libdca")
@@ -146,6 +176,7 @@ SMPTE 314M.")
("opus" ,opus)
("lame" ,lame)
("libbluray" ,libbluray)
+ ("libcaca" ,libcaca)
("libtheora" ,libtheora)
("libvorbis" ,libvorbis)
("libvpx" ,libvpx)
@@ -189,7 +220,6 @@ SMPTE 314M.")
;; --enable-ladspa enable LADSPA audio filtering
;; --enable-libaacplus enable AAC+ encoding via libaacplus [no]
;; --enable-libass enable libass subtitles rendering [no]
-;; --enable-libcaca enable textual display using libcaca
;; --enable-libcelt enable CELT decoding via libcelt [no]
;; --enable-libcdio enable audio CD grabbing with libcdio
;; --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394
@@ -237,6 +267,7 @@ SMPTE 314M.")
"--enable-fontconfig"
;; "--enable-gnutls" ; causes test failures
"--enable-libbluray"
+ "--enable-libcaca"
"--enable-libfreetype"
"--enable-libmp3lame"
"--enable-libopus"
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #16: 0015-gnu-Add-libquvi-scripts.patch --]
[-- Type: text/x-diff, Size: 1300 bytes --]
From e962ba6d7864af68cce86eb46d4164d378de2f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Wed, 4 Mar 2015 22:35:53 +0100
Subject: [PATCH 15/25] gnu: Add libquvi-scripts.
* gnu/packages/web.scm (libquvi-scripts): New variable.
---
gnu/packages/web.scm | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 8754ece..4e74613 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -817,3 +817,21 @@ of people.")
(description
"LibYAML is a YAML 1.1 parser and emitter written in C.")
(license l:expat)))
+
+(define-public libquvi-scripts
+ (package
+ (name "libquvi-scripts")
+ (version "0.4.21")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://sourceforge/quvi/libquvi-scripts-" version ".tar.xz"))
+ (sha256
+ (base32 "0d0giry6bb57pnidymvdl7i5x9bq3ljk3g4bs294hcr5mj3cq0kw"))))
+ (build-system gnu-build-system)
+ (home-page "http://quvi.sourceforge.net/")
+ (synopsis "Media stream URL parser")
+ (description "This package contains support scripts called by libquvi to
+parse media stream properties.")
+ (license l:lgpl2.1+)))
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #17: 0016-gnu-Add-libquvi.patch --]
[-- Type: text/x-diff, Size: 4101 bytes --]
From abeb0190b5dd7f99b336aaee6d96cd66140e4f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sat, 7 Mar 2015 12:18:32 +0100
Subject: [PATCH 16/25] gnu: Add libquvi.
* gnu/packages/web.scm (libquvi): New variable.
* gnu/packages/video.scm (ffmpeg): Add input libquvi.
---
gnu/packages/video.scm | 4 +++-
gnu/packages/web.scm | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 980c9ef..598e164 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -63,6 +63,7 @@
#:use-module (gnu packages ssh)
#:use-module (gnu packages texlive)
#:use-module (gnu packages version-control)
+ #:use-module (gnu packages web)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
@@ -177,6 +178,7 @@ SMPTE 314M.")
("lame" ,lame)
("libbluray" ,libbluray)
("libcaca" ,libcaca)
+ ("libquvi" ,libquvi)
("libtheora" ,libtheora)
("libvorbis" ,libvorbis)
("libvpx" ,libvpx)
@@ -239,7 +241,6 @@ SMPTE 314M.")
;; --enable-libopencv enable video filtering via libopencv [no]
;; --enable-libopenjpeg enable JPEG 2000 de/encoding via OpenJPEG [no]
;; --enable-libpulse enable Pulseaudio input via libpulse [no]
-;; --enable-libquvi enable quvi input via libquvi [no]
;; --enable-librtmp enable RTMP[E] support via librtmp [no]
;; --enable-libschroedinger enable Dirac de/encoding via libschroedinger [no]
;; --enable-libshine enable fixed-point MP3 encoding via libshine [no]
@@ -271,6 +272,7 @@ SMPTE 314M.")
"--enable-libfreetype"
"--enable-libmp3lame"
"--enable-libopus"
+ "--enable-libquvi"
"--enable-libsoxr"
"--enable-libspeex"
"--enable-libtheora"
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 4e74613..45bf5ba 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -36,11 +36,14 @@
#:use-module (gnu packages docbook)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages openssl)
#:use-module (gnu packages gettext)
#:use-module (gnu packages icu4c)
+ #:use-module (gnu packages lua)
#:use-module (gnu packages base)
#:use-module (gnu packages pcre)
+ #:use-module (gnu packages pkg-config)
#:use-module (gnu packages xml)
#:use-module (gnu packages curl)
#:use-module (gnu packages perl)
@@ -835,3 +838,36 @@ of people.")
(description "This package contains support scripts called by libquvi to
parse media stream properties.")
(license l:lgpl2.1+)))
+
+(define-public libquvi
+ (package
+ (name "libquvi")
+ (version "0.4.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://sourceforge/quvi/libquvi-" version ".tar.xz"))
+ (sha256
+ (base32 "00x9gbmzc5cns0gnfag0hsphcr3cb33vbbb9s7ppvvd6bxz2z1mm"))))
+ (build-system gnu-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("curl" ,curl)
+ ("cyrus-sasl" ,cyrus-sasl)
+ ("libquvi-scripts" ,libquvi-scripts)
+ ("lua" ,lua-5.1)
+ ("openssl" ,openssl)
+ ("zlib" ,zlib)))
+ (arguments
+ ;; Lua provides no .pc file, so add CFLAGS/LIBS manually.
+ '(#:configure-flags
+ (let ((lua (assoc-ref %build-inputs "lua")))
+ (list
+ (string-append "liblua_CFLAGS=-I" lua "/include")
+ (string-append "liblua_LIBS=-L" lua "/libs -llua")))))
+ (home-page "http://quvi.sourceforge.net/")
+ (synopsis "Media stream URL parser")
+ (description "libquvi is a library with a C API for parsing media stream
+URLs and extracting their actual media files.")
+ (license l:lgpl2.1+)))
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #18: 0017-gnu-Add-quvi.patch --]
[-- Type: text/x-diff, Size: 1477 bytes --]
From 8a9ec670c8708668491e2a69fbca31b2150f6046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sat, 7 Mar 2015 12:19:47 +0100
Subject: [PATCH 17/25] gnu: Add quvi.
* gnu/packages/web.scm (quvi): New variable.
---
gnu/packages/web.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 45bf5ba..c977a1e 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -871,3 +871,25 @@ parse media stream properties.")
(description "libquvi is a library with a C API for parsing media stream
URLs and extracting their actual media files.")
(license l:lgpl2.1+)))
+
+(define-public quvi
+ (package
+ (name "quvi")
+ (version "0.4.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://sourceforge/quvi/quvi-" version ".tar.xz"))
+ (sha256
+ (base32 "09lhl6dv5zpryasx7yjslfrcdcqlsbwapvd5lg7w6sm5x5n3k8ci"))))
+ (build-system gnu-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("curl" ,curl)
+ ("libquvi" ,libquvi)))
+ (home-page "http://quvi.sourceforge.net/")
+ (synopsis "Media stream URL parser")
+ (description "quvi is a command-line-tool suite to extract media files
+from streaming URLs. It is a command-line wrapper for the libquvi library.")
+ (license l:lgpl2.1+)))
--
2.2.1
[-- Attachment #19: 0018-gnu-cdio-Fix-description.patch --]
[-- Type: text/x-diff, Size: 1573 bytes --]
From f02e24d7bfc6e543a42dae8da8c28e5c4f880ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Thu, 5 Mar 2015 20:41:22 +0100
Subject: [PATCH 18/25] gnu: cdio: Fix description.
* gnu/packages/cdrom.scm (libcdio): This package does not contain pycdio or
libcdio-paranoia, so remove these from the description. They can be
obtained separately from <ftp://ftp.gnu.org/pub/gnu/libcdio/>.
---
gnu/packages/cdrom.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index ac5f64f..05980bc 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -94,9 +95,7 @@ caching facility provided by the library.")
for CD-ROM and CD image file access. It allows the developer to add CD
access to an application without having to worry about the OS- and
device-dependent properties of CD-ROM or the specific details of CD image
-formats. It includes pycdio, a Python interface to libcdio, and
-libcdio-paranoia, a library providing jitter-free and error-free audio
-extraction from CDs.")
+formats.")
(license gpl3+)))
(define-public xorriso
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #20: 0019-gnu-Add-libcdio-paranoia.patch --]
[-- Type: text/x-diff, Size: 2935 bytes --]
From 7cb50d07e5b9b44de1c903b6a8e5f920d397457c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Thu, 5 Mar 2015 20:44:00 +0100
Subject: [PATCH 19/25] gnu: Add libcdio-paranoia.
* gnu/packages/cdrom.scm (libcdio-paranoia): New variable.
* gnu/packages/video.scm (ffmpeg): Add input libcdio-paranoia.
---
gnu/packages/cdrom.scm | 21 +++++++++++++++++++++
gnu/packages/video.scm | 3 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 05980bc..9af0ea7 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -98,6 +98,27 @@ device-dependent properties of CD-ROM or the specific details of CD image
formats.")
(license gpl3+)))
+(define-public libcdio-paranoia
+ (package
+ (name "libcdio-paranoia")
+ (version "10.2+0.93+1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/libcdio/libcdio-paranoia-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "14x4b4jk5b0zvcalrg02y4jmbkmmlb07qfmk5hph9k18b8frn7gc"))))
+ (build-system gnu-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (propagated-inputs `(("libcdio" ,libcdio)))
+ (home-page "http://www.gnu.org/software/libcdio/")
+ (synopsis "Jitter- and error-tolerant CD audio extraction")
+ (description
+ "libcdio-paranoia is an implementation of CD paranoia libraries based on
+libcdio.")
+ (license gpl3+)))
+
(define-public xorriso
(package
(name "xorriso")
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 598e164..5404f9d 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -178,6 +178,7 @@ SMPTE 314M.")
("lame" ,lame)
("libbluray" ,libbluray)
("libcaca" ,libcaca)
+ ("libcdio-paranoia" ,libcdio-paranoia)
("libquvi" ,libquvi)
("libtheora" ,libtheora)
("libvorbis" ,libvorbis)
@@ -223,7 +224,6 @@ SMPTE 314M.")
;; --enable-libaacplus enable AAC+ encoding via libaacplus [no]
;; --enable-libass enable libass subtitles rendering [no]
;; --enable-libcelt enable CELT decoding via libcelt [no]
-;; --enable-libcdio enable audio CD grabbing with libcdio
;; --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394
;; and libraw1394 [no]
;; --enable-libfaac enable AAC encoding via libfaac [no]
@@ -269,6 +269,7 @@ SMPTE 314M.")
;; "--enable-gnutls" ; causes test failures
"--enable-libbluray"
"--enable-libcaca"
+ "--enable-libcdio"
"--enable-libfreetype"
"--enable-libmp3lame"
"--enable-libopus"
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #21: 0020-gnu-ffmpeg-Add-more-optional-inputs.patch --]
[-- Type: text/x-diff, Size: 3533 bytes --]
From 6cb7bd5138e7ec29e51afe125273818123797336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Thu, 5 Mar 2015 19:54:25 +0100
Subject: [PATCH 20/25] gnu: ffmpeg: Add more optional inputs.
* gnu/packages/video.scm (ffmpeg): Add inputs ladspa, openal, pulseaudio.
---
gnu/packages/video.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 5404f9d..3b7161b 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -175,6 +175,7 @@ SMPTE 314M.")
`(("fontconfig" ,fontconfig)
("freetype" ,freetype)
("opus" ,opus)
+ ("ladspa" ,ladspa)
("lame" ,lame)
("libbluray" ,libbluray)
("libcaca" ,libcaca)
@@ -183,7 +184,9 @@ SMPTE 314M.")
("libtheora" ,libtheora)
("libvorbis" ,libvorbis)
("libvpx" ,libvpx)
+ ("openal" ,openal)
("patchelf" ,patchelf)
+ ("pulseaudio" ,pulseaudio)
("soxr" ,soxr)
("speex" ,speex)
("twolame" ,twolame)
@@ -220,7 +223,6 @@ SMPTE 314M.")
;; possible additional inputs:
;; --enable-avisynth enable reading of AviSynth script files [no]
;; --enable-frei0r enable frei0r video filtering
-;; --enable-ladspa enable LADSPA audio filtering
;; --enable-libaacplus enable AAC+ encoding via libaacplus [no]
;; --enable-libass enable libass subtitles rendering [no]
;; --enable-libcelt enable CELT decoding via libcelt [no]
@@ -240,7 +242,6 @@ SMPTE 314M.")
;; --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
;; --enable-libopencv enable video filtering via libopencv [no]
;; --enable-libopenjpeg enable JPEG 2000 de/encoding via OpenJPEG [no]
-;; --enable-libpulse enable Pulseaudio input via libpulse [no]
;; --enable-librtmp enable RTMP[E] support via librtmp [no]
;; --enable-libschroedinger enable Dirac de/encoding via libschroedinger [no]
;; --enable-libshine enable fixed-point MP3 encoding via libshine [no]
@@ -257,7 +258,6 @@ SMPTE 314M.")
;; --enable-libxavs enable AVS encoding via xavs [no]
;; --enable-libzmq enable message passing via libzmq [no]
;; --enable-libzvbi enable teletext support via libzvbi [no]
-;; --enable-openal enable OpenAL 1.1 capture support [no]
;; --enable-opencl enable OpenCL code
;; --enable-x11grab enable X11 grabbing [no]
(zero? (system*
@@ -267,12 +267,14 @@ SMPTE 314M.")
"--enable-shared"
"--enable-fontconfig"
;; "--enable-gnutls" ; causes test failures
+ "--enable-ladspa"
"--enable-libbluray"
"--enable-libcaca"
"--enable-libcdio"
"--enable-libfreetype"
"--enable-libmp3lame"
"--enable-libopus"
+ "--enable-libpulse"
"--enable-libquvi"
"--enable-libsoxr"
"--enable-libspeex"
@@ -281,6 +283,7 @@ SMPTE 314M.")
"--enable-libvorbis"
"--enable-libvpx"
"--enable-libxvid"
+ "--enable-openal"
"--enable-runtime-cpudetect"
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #22: 0021-gnu-ffmpeg-Enable-libavresample.patch --]
[-- Type: text/x-diff, Size: 924 bytes --]
From 92a23da49f542a81d02df34c0e29100560fe2449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Fri, 6 Mar 2015 10:18:39 +0100
Subject: [PATCH 21/25] gnu: ffmpeg: Enable libavresample.
* gnu/packages/video.scm (ffmpeg): Add "--enable-avresample" configure option.
---
gnu/packages/video.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 3b7161b..abc9704 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -263,6 +263,7 @@ SMPTE 314M.")
(zero? (system*
"./configure"
(string-append "--prefix=" out)
+ "--enable-avresample"
"--enable-gpl" ; enable optional gpl licensed parts
"--enable-shared"
"--enable-fontconfig"
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-07 18:24 Taylan Ulrich Bayırlı/Kammer
@ 2015-03-09 9:14 ` Ludovic Courtès
0 siblings, 0 replies; 16+ messages in thread
From: Ludovic Courtès @ 2015-03-09 9:14 UTC (permalink / raw)
To: Taylan Ulrich "Bayırlı/Kammer"; +Cc: guix-devel
taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:
> Tracking the dependency DAG of mplayer2 lead to a big series of patches.
> These are the fairly simple first 21 out of a total 25. I will push
> them in let's say two days if nobody has comments.
>
> 5 of the patches do something else than adding a package:
>
> - openal has been moved from games to audio,
>
> - freeglut now propagates input glu,
>
> - cdio had a misleading description claiming it includes pycdio and
> libcdio-paranoia, when it doesn't; it's now fixed,
>
> - ffmpeg got three more optional inputs that were already packaged,
>
> - ffmpeg now builds with libavresample support.
>
> Moreover, a handful of the package-adding patches also add the added
> package as an additional optional input to ffmpeg.
From a quick glance, this all looks reasonable to me. Please run
‘make clean-go && make’ to make sure the shuffling didn’t introduce any
issue, just in case, and check that the new packages pass ‘guix lint’ if
you haven’t already.
Thank you for all this work!
Ludo’.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCHES] Various
@ 2015-03-22 11:52 Taylan Ulrich Bayırlı/Kammer
2015-03-25 11:07 ` Taylan Ulrich Bayırlı/Kammer
2015-03-25 16:50 ` Ludovic Courtès
0 siblings, 2 replies; 16+ messages in thread
From: Taylan Ulrich Bayırlı/Kammer @ 2015-03-22 11:52 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
Here's a series of patches from tracking libva's and VapourSynth's
recursive dependencies. (They themselves are optional dependencies to
mpv, to whose review-awaiting patch I added them, which shouldn't change
the review result.)
All patches add packages without anything unusual, except for:
- (gnu packages ocrad) renamed to (gnu packages ocr),
- freeglut now propagates mesa.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-libva.patch --]
[-- Type: text/x-diff, Size: 2042 bytes --]
From 2474d2e4818975255e02dd2d17496faf5ff42755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Fri, 20 Mar 2015 15:52:52 +0100
Subject: [PATCH 1/8] gnu: Add libva.
* gnu/packages/video.scm (libva): New variable.
---
gnu/packages/video.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index a7f39b8..c3ab772 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -71,6 +71,7 @@
#:use-module (gnu packages web)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (gnu packages yasm)
#:use-module (gnu packages zip))
@@ -195,6 +196,35 @@ developed according to the official standards for DV video: IEC 61834 and
SMPTE 314M.")
(license lgpl2.1+)))
+(define-public libva
+ (package
+ (name "libva")
+ (version "1.5.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://www.freedesktop.org/software/vaapi/releases/libva/libva-"
+ version".tar.bz2"))
+ (sha256
+ (base32 "01d01mm9fgpwzqycmjjcj3in3vvzcibi3f64icsw2sksmmgb4495"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("libdrm" ,libdrm)
+ ("libx11" ,libx11)
+ ("libxext" ,libxext)
+ ("libxfixes" ,libxfixes)
+ ("mesa" ,mesa)))
+ (home-page "http://www.freedesktop.org/wiki/Software/vaapi/")
+ (synopsis "Video Acceleration API")
+ (description "The main motivation for VA-API (Video Acceleration API) is
+to enable hardware accelerated video decode/encode at various
+entry-points (VLD, IDCT, Motion Compensation etc.) for prevailing coding
+standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
+ (license expat)))
+
(define-public ffmpeg
(package
(name "ffmpeg")
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-freeglut-Add-mesa-to-propagated-inputs.patch --]
[-- Type: text/x-diff, Size: 992 bytes --]
From a82ac3f13f71764405575df875409e375fb71b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sat, 21 Mar 2015 19:36:25 +0100
Subject: [PATCH 2/8] gnu: freeglut: Add mesa to propagated inputs.
* gnu/packages/gl.scm (freeglut): Add mesa to propagated inputs.
---
gnu/packages/gl.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index e9b2c53..dc90a12 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -84,7 +84,10 @@ as ASCII text.")
("libxxf86vm" ,libxxf86vm)
("inputproto" ,inputproto)
("xinput" ,xinput)))
- (propagated-inputs `(("glu" ,glu)))
+ (propagated-inputs
+ ;; Headers from Mesa and GLU are needed.
+ `(("glu" ,glu)
+ ("mesa" ,mesa)))
(home-page "http://freeglut.sourceforge.net/")
(synopsis "Alternative to the OpenGL Utility Toolkit (GLUT)")
(description
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-Add-libwebp.patch --]
[-- Type: text/x-diff, Size: 2501 bytes --]
From f74b6c39b8b6f90fe4dbe19c925cf703c82e3d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sat, 21 Mar 2015 19:40:21 +0100
Subject: [PATCH 3/8] gnu: Add libwebp.
* gnu/packages/image.scm (freeimage): New variable.
---
gnu/packages/image.scm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 11cb63a..9c7e504 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -29,6 +29,7 @@
#:use-module (gnu packages doxygen)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages gl)
#:use-module (gnu packages maths)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -475,3 +476,39 @@ algorithms and data structures. It is particularly strong for
multi-dimensional image processing.")
(license license:expat)
(home-page "https://hci.iwr.uni-heidelberg.de/vigra")))
+
+(define-public libwebp
+ (package
+ (name "libwebp")
+ (version "0.4.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://downloads.webmproject.org/releases/webp/libwebp-" version
+ ".tar.gz"))
+ (sha256
+ (base32 "1i4hfczjm3b1qj1g4cc9hgb69l47f3nkgf6hk7nz4dm9zmc0vgpg"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("freeglut" ,freeglut)
+ ("giflib" ,giflib)
+ ("libjpeg" ,libjpeg)
+ ("libpng" ,libpng)
+ ("libtiff" ,libtiff)))
+ (arguments
+ '(#:configure-flags '("--enable-libwebpmux"
+ "--enable-libwebpdemux"
+ "--enable-libwebpdecoder")))
+ (home-page "https://developers.google.com/speed/webp/")
+ (synopsis "Lossless and lossy image compression")
+ (description
+ "WebP is a new image format that provides lossless and lossy compression
+for images. WebP lossless images are 26% smaller in size compared to
+PNGs. WebP lossy images are 25-34% smaller in size compared to JPEG images at
+equivalent SSIM index. WebP supports lossless transparency (also known as
+alpha channel) with just 22% additional bytes. Transparency is also supported
+with lossy compression and typically provides 3x smaller file sizes compared
+to PNG when lossy compression is acceptable for the red/green/blue color
+channels.")
+ (license license:bsd-3)))
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0004-gnu-Add-leptonica.patch --]
[-- Type: text/x-diff, Size: 2821 bytes --]
From 469c7605b457385e730a8d429b85f05c6e4d32d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sat, 21 Mar 2015 19:41:54 +0100
Subject: [PATCH 4/8] gnu: Add leptonica.
* gnu/packages/image.scm (leptonica): New variable.
---
gnu/packages/image.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 9c7e504..537cd57 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -24,6 +24,7 @@
(define-module (gnu packages image)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
#:use-module (gnu packages compression)
#:use-module (gnu packages doxygen)
@@ -164,6 +165,54 @@ the W3C's XML-based Scaleable Vector Graphic (SVG) format.")
;; 'COPYING' is the GPLv2, but file headers say LGPLv2.0+.
(license license:lgpl2.0+)))
+(define-public leptonica
+ (package
+ (name "leptonica")
+ (version "1.71")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://www.leptonica.com/source/leptonica-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "0j5qgrff6im5n9waflbi7w643q1p6mahyf2z35gb4vj9h5p76pfc"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("gnuplot" ,gnuplot) ;needed for test suite
+ ("libtool" ,libtool)))
+ (inputs
+ `(("giflib" ,giflib)
+ ("libjpeg" ,libjpeg)
+ ("libpng" ,libpng)
+ ("libtiff" ,libtiff)
+ ("libwebp" ,libwebp)
+ ("openjpeg" ,openjpeg)
+ ("zlib" ,zlib)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after
+ unpack autoreconf
+ (lambda _
+ (zero? (system* "autoreconf" "-vif"))))
+ (add-after
+ autoreconf patch-reg-wrapper
+ (lambda _
+ (substitute* "prog/reg_wrapper.sh"
+ ((" /bin/sh ")
+ (string-append " " (which "sh") " "))))))))
+ (home-page "http://www.leptonica.com/")
+ (synopsis "Image processing and image analysis operations")
+ (description
+ "Leptonica is a C library for efficient image processing and image
+analysis operations. It supports rasterop, affine transformations, binary and
+grayscale morphology, rank order, and convolution, seedfill and connected
+components, image transformations combining changes in scale and pixel depth,
+and pixelwise masking, blending, enhancement, arithmetic ops.")
+ (license license:bsd-2)))
+
(define-public jbig2dec
(package
(name "jbig2dec")
--
2.2.1
[-- Attachment #6: 0005-gnu-Rename-gnu-packages-ocrad-to-gnu-packages-ocr.patch --]
[-- Type: text/x-diff, Size: 5382 bytes --]
From a37984a20b50d8be8ec3d1a9cd01a7f08057c9bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Fri, 20 Mar 2015 16:22:34 +0100
Subject: [PATCH 5/8] gnu: Rename (gnu packages ocrad) to (gnu packages ocr).
* gnu/packages/ocrad.scm: Deleted.
* gnu/packages/ocr.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Change ocrad.scm to ocr.scm.
---
gnu-system.am | 2 +-
gnu/packages/ocr.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++
gnu/packages/ocrad.scm | 46 ----------------------------------------------
3 files changed, 47 insertions(+), 47 deletions(-)
create mode 100644 gnu/packages/ocr.scm
delete mode 100644 gnu/packages/ocrad.scm
diff --git a/gnu-system.am b/gnu-system.am
index 154f51f..04c9c5e 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -218,7 +218,7 @@ GNU_SYSTEM_MODULES = \
gnu/packages/nutrition.scm \
gnu/packages/nvi.scm \
gnu/packages/ocaml.scm \
- gnu/packages/ocrad.scm \
+ gnu/packages/ocr.scm \
gnu/packages/onc-rpc.scm \
gnu/packages/openbox.scm \
gnu/packages/openldap.scm \
diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm
new file mode 100644
index 0000000..8408b43
--- /dev/null
+++ b/gnu/packages/ocr.scm
@@ -0,0 +1,46 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages ocr)
+ #:use-module (guix licenses)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu)
+ #:use-module ((gnu packages compression)
+ #:select (lzip)))
+
+(define-public ocrad
+ (package
+ (name "ocrad")
+ (version "0.24")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/ocrad/ocrad-"
+ version ".tar.lz"))
+ (sha256
+ (base32
+ "0hhlx072d00bi9qia0nj5izsq4qkscpfz2mpbyfc72msl3hfvslv"))))
+ (build-system gnu-build-system)
+ (native-inputs `(("lzip" ,lzip)))
+ (home-page "http://www.gnu.org/software/ocrad/")
+ (synopsis "Optical character recognition based on feature extraction")
+ (description
+ "GNU Ocrad is an optical character recognition program based on a
+feature extraction method. It can read images in PBM, PGM or PPM formats and
+it produces text in 8-bit or UTF-8 formats.")
+ (license gpl3+)))
diff --git a/gnu/packages/ocrad.scm b/gnu/packages/ocrad.scm
deleted file mode 100644
index 8ad4f32..0000000
--- a/gnu/packages/ocrad.scm
+++ /dev/null
@@ -1,46 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages ocrad)
- #:use-module (guix licenses)
- #:use-module (guix packages)
- #:use-module (guix download)
- #:use-module (guix build-system gnu)
- #:use-module ((gnu packages compression)
- #:select (lzip)))
-
-(define-public ocrad
- (package
- (name "ocrad")
- (version "0.24")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/ocrad/ocrad-"
- version ".tar.lz"))
- (sha256
- (base32
- "0hhlx072d00bi9qia0nj5izsq4qkscpfz2mpbyfc72msl3hfvslv"))))
- (build-system gnu-build-system)
- (native-inputs `(("lzip" ,lzip)))
- (home-page "http://www.gnu.org/software/ocrad/")
- (synopsis "Optical character recognition based on feature extraction")
- (description
- "GNU Ocrad is an optical character recognition program based on a
-feature extraction method. It can read images in PBM, PGM or PPM formats and
-it produces text in 8-bit or UTF-8 formats.")
- (license gpl3+)))
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #7: 0006-gnu-Add-tesseract-ocr.patch --]
[-- Type: text/x-diff, Size: 3037 bytes --]
From 44d0388a570bfc683c2b58f39ac039232f4eb1b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sat, 21 Mar 2015 20:11:56 +0100
Subject: [PATCH 6/8] gnu: Add tesseract-ocr.
* gnu/packages/ocr.scm (tesseract-ocr): New variable.
---
gnu/packages/ocr.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 49 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm
index 8408b43..3c0fd40 100644
--- a/gnu/packages/ocr.scm
+++ b/gnu/packages/ocr.scm
@@ -17,12 +17,14 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages ocr)
- #:use-module (guix licenses)
+ #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
- #:use-module ((gnu packages compression)
- #:select (lzip)))
+ #:use-module (gnu packages autotools)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages image)
+ #:use-module (gnu packages pkg-config))
(define-public ocrad
(package
@@ -43,4 +45,47 @@
"GNU Ocrad is an optical character recognition program based on a
feature extraction method. It can read images in PBM, PGM or PPM formats and
it produces text in 8-bit or UTF-8 formats.")
- (license gpl3+)))
+ (license license:gpl3+)))
+
+(define-public tesseract-ocr
+ (package
+ (name "tesseract-ocr")
+ (version "3.02.02")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://tesseract-ocr.googlecode.com/files/tesseract-ocr-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "0g81m9y4iydp7kgr56mlkvjdwpp3mb01q385yhdnyvra7z5kkk96"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)))
+ (inputs
+ `(("leptonica" ,leptonica)))
+ (propagated-inputs
+ ;; These are linked in as well when linking against libocr.
+ `(("openjpeg" ,openjpeg)
+ ("zlib" ,zlib)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after
+ unpack autogen
+ (lambda _
+ (zero? (system* "sh" "autogen.sh")))))
+ #:configure-flags
+ (let ((leptonica (assoc-ref %build-inputs "leptonica")))
+ (list (string-append "LIBLEPT_HEADERSDIR=" leptonica "/include")))))
+ (home-page "https://code.google.com/p/tesseract-ocr/")
+ (synopsis "Optical character recognition engine")
+ (description
+ "Tesseract is an optical character recognition (OCR) engine with very
+high accuracy. It supports many languages, output text formatting, hOCR
+positional information and page layout analysis. Several image formats are
+supported through the Leptonica library. It can also detect whether text is
+monospaced or proportional.")
+ (license license:asl2.0)))
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #8: 0007-gnu-Add-vapoursynth.patch --]
[-- Type: text/x-diff, Size: 2256 bytes --]
From e7dd88e1158bc4e804e8eb43c0b0fff165b94703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sat, 21 Mar 2015 23:09:11 +0100
Subject: [PATCH 7/8] gnu: Add vapoursynth.
* gnu/packages/video.scm (vapoursynth): New variable.
---
gnu/packages/video.scm | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c3ab772..6107c62 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -56,6 +56,7 @@
#:use-module (gnu packages lua)
#:use-module (gnu packages mp3)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages ocr)
#:use-module (gnu packages openssl)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -1095,6 +1096,45 @@ capabilities.")
(alist-delete 'install
%standard-phases)))))))))
+(define-public vapoursynth
+ (package
+ (name "vapoursynth")
+ (version "26")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/vapoursynth/vapoursynth/archive/R"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1qbg5kg0kgrxldd0ckn1s7vy7vx2ig8nqzv6djp38fxccpzw3x9k"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("cython" ,python-cython)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python)
+ ("yasm" ,yasm)))
+ (inputs
+ `(("ffmpeg" ,ffmpeg)
+ ("libass" ,libass)
+ ("tesseract-ocr" ,tesseract-ocr)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after
+ unpack autogen
+ (lambda _
+ (zero? (system* "sh" "autogen.sh")))))))
+ (home-page "http://www.vapoursynth.com/")
+ (synopsis "Video processing framework")
+ (description "VapourSynth is a video processing framework with simplicity
+in mind. ")
+ ;; As seen from the source files.
+ (license lgpl2.1+)))
+
(define-public xvid
(package
(name "xvid")
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-22 11:52 [PATCHES] Various Taylan Ulrich Bayırlı/Kammer
@ 2015-03-25 11:07 ` Taylan Ulrich Bayırlı/Kammer
2015-03-25 16:47 ` Ludovic Courtès
2015-03-25 16:50 ` Ludovic Courtès
1 sibling, 1 reply; 16+ messages in thread
From: Taylan Ulrich Bayırlı/Kammer @ 2015-03-25 11:07 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]
taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") writes:
> Here's a series of patches from tracking libva's and VapourSynth's
> recursive dependencies. (They themselves are optional dependencies to
> mpv, to whose review-awaiting patch I added them, which shouldn't
> change the review result.)
I made a few changes to the patches on the meanwhile.
The description of VapourSynth was incomplete (apologies, working on too
many things made me sloppy). The synopsis and description of Leptonica
has been improved.
More importantly, I found out it's not Tesseract that should propagate
zlib and openjpg; it's Leptonica. And Tesseract should propagate
Leptonica as per a commented-out Requires line in its pkg-config file.
So I patched the pkg-config files of Leptonica (to move zlib and
openjpeg from Libs.private to Libs) and Tesseract (to enable the
Requires field, since Leptonica provides lept.pc on the meanwhile).
The relevant Tesseract bug report is at:
https://code.google.com/p/tesseract-ocr/issues/detail?id=1436
I will send a bug report to the Leptonica author privately since I
couldn't find a bug tracker or mailing list.
Updated patches attached.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0004-gnu-Add-leptonica.patch --]
[-- Type: text/x-diff, Size: 3355 bytes --]
From 41e485e47749119afc039796e88fcf8f787eeabc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sat, 21 Mar 2015 19:41:54 +0100
Subject: [PATCH 4/8] gnu: Add leptonica.
* gnu/packages/image.scm (leptonica): New variable.
---
gnu/packages/image.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 9c7e504..4dd3090 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -24,6 +24,7 @@
(define-module (gnu packages image)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
#:use-module (gnu packages compression)
#:use-module (gnu packages doxygen)
@@ -164,6 +165,66 @@ the W3C's XML-based Scaleable Vector Graphic (SVG) format.")
;; 'COPYING' is the GPLv2, but file headers say LGPLv2.0+.
(license license:lgpl2.0+)))
+(define-public leptonica
+ (package
+ (name "leptonica")
+ (version "1.71")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://www.leptonica.com/source/leptonica-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "0j5qgrff6im5n9waflbi7w643q1p6mahyf2z35gb4vj9h5p76pfc"))
+ (modules '((guix build utils)))
+ ;; zlib and openjpg should be under Libs, not Libs.private.
+ (snippet
+ '(substitute* "lept.pc.in"
+ (("^(Libs\\.private: .*)@ZLIB_LIBS@(.*)" all pre post)
+ (string-append pre post))
+ (("^(Libs\\.private: .*)@JPEG_LIBS@(.*)" all pre post)
+ (string-append pre post))
+ (("^Libs: .*" all)
+ (string-append all " @ZLIB_LIBS@ @JPEG_LIBS@"))))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("gnuplot" ,gnuplot) ;needed for test suite
+ ("libtool" ,libtool)))
+ (inputs
+ `(("giflib" ,giflib)
+ ("libjpeg" ,libjpeg)
+ ("libpng" ,libpng)
+ ("libtiff" ,libtiff)
+ ("libwebp" ,libwebp)))
+ (propagated-inputs
+ `(("openjpeg" ,openjpeg)
+ ("zlib" ,zlib)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after
+ unpack autoreconf
+ (lambda _
+ (zero? (system* "autoreconf" "-vif"))))
+ (add-after
+ autoreconf patch-reg-wrapper
+ (lambda _
+ (substitute* "prog/reg_wrapper.sh"
+ ((" /bin/sh ")
+ (string-append " " (which "sh") " "))))))))
+ (home-page "http://www.leptonica.com/")
+ (synopsis "Library and tools for image processing and analysis")
+ (description
+ "Leptonica is a C library and set of command-line tools for efficient
+image processing and image analysis operations. It supports rasterop, affine
+transformations, binary and grayscale morphology, rank order, and convolution,
+seedfill and connected components, image transformations combining changes in
+scale and pixel depth, and pixelwise masking, blending, enhancement, and
+arithmetic ops.")
+ (license license:bsd-2)))
+
(define-public jbig2dec
(package
(name "jbig2dec")
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0006-gnu-Add-tesseract-ocr.patch --]
[-- Type: text/x-diff, Size: 3143 bytes --]
From d12b1999a228d34e76cb93cba1a75cf7d18176bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sat, 21 Mar 2015 20:11:56 +0100
Subject: [PATCH 6/8] gnu: Add tesseract-ocr.
* gnu/packages/ocr.scm (tesseract-ocr): New variable.
---
gnu/packages/ocr.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 51 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm
index 8408b43..157c1ca 100644
--- a/gnu/packages/ocr.scm
+++ b/gnu/packages/ocr.scm
@@ -17,12 +17,14 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages ocr)
- #:use-module (guix licenses)
+ #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
- #:use-module ((gnu packages compression)
- #:select (lzip)))
+ #:use-module (gnu packages autotools)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages image)
+ #:use-module (gnu packages pkg-config))
(define-public ocrad
(package
@@ -43,4 +45,49 @@
"GNU Ocrad is an optical character recognition program based on a
feature extraction method. It can read images in PBM, PGM or PPM formats and
it produces text in 8-bit or UTF-8 formats.")
- (license gpl3+)))
+ (license license:gpl3+)))
+
+(define-public tesseract-ocr
+ (package
+ (name "tesseract-ocr")
+ (version "3.02.02")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://tesseract-ocr.googlecode.com/files/tesseract-ocr-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "0g81m9y4iydp7kgr56mlkvjdwpp3mb01q385yhdnyvra7z5kkk96"))
+ (modules '((guix build utils)))
+ ;; Leptonica provides a pkg-config file on the meanwhile.
+ (snippet
+ '(substitute* "tesseract.pc.in"
+ (("^# Requires: lept ## .*")
+ "Requires: lept\n")))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)))
+ (propagated-inputs
+ `(("leptonica" ,leptonica)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after
+ unpack autogen
+ (lambda _
+ (zero? (system* "sh" "autogen.sh")))))
+ #:configure-flags
+ (let ((leptonica (assoc-ref %build-inputs "leptonica")))
+ (list (string-append "LIBLEPT_HEADERSDIR=" leptonica "/include")))))
+ (home-page "https://code.google.com/p/tesseract-ocr/")
+ (synopsis "Optical character recognition engine")
+ (description
+ "Tesseract is an optical character recognition (OCR) engine with very
+high accuracy. It supports many languages, output text formatting, hOCR
+positional information and page layout analysis. Several image formats are
+supported through the Leptonica library. It can also detect whether text is
+monospaced or proportional.")
+ (license license:asl2.0)))
--
2.2.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0007-gnu-Add-vapoursynth.patch --]
[-- Type: text/x-diff, Size: 2411 bytes --]
From 4c8af1741208f2d65e8ca9f3a37df38eb93a4b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sat, 21 Mar 2015 23:09:11 +0100
Subject: [PATCH 7/8] gnu: Add vapoursynth.
* gnu/packages/video.scm (vapoursynth): New variable.
---
gnu/packages/video.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c3ab772..1029c2f 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -56,6 +56,7 @@
#:use-module (gnu packages lua)
#:use-module (gnu packages mp3)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages ocr)
#:use-module (gnu packages openssl)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -1095,6 +1096,47 @@ capabilities.")
(alist-delete 'install
%standard-phases)))))))))
+(define-public vapoursynth
+ (package
+ (name "vapoursynth")
+ (version "26")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/vapoursynth/vapoursynth/archive/R"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1qbg5kg0kgrxldd0ckn1s7vy7vx2ig8nqzv6djp38fxccpzw3x9k"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("cython" ,python-cython)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python)
+ ("yasm" ,yasm)))
+ (inputs
+ `(("ffmpeg" ,ffmpeg)
+ ("libass" ,libass)
+ ("tesseract-ocr" ,tesseract-ocr)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after
+ unpack autogen
+ (lambda _
+ (zero? (system* "sh" "autogen.sh")))))))
+ (home-page "http://www.vapoursynth.com/")
+ (synopsis "Video processing framework")
+ (description "VapourSynth is a C++ library and Python module for video
+manipulation. It aims to be a modern rewrite of Avisynth, supporting
+multithreading, generalized colorspaces, per frame properties, and videos with
+format changes.")
+ ;; As seen from the source files.
+ (license lgpl2.1+)))
+
(define-public xvid
(package
(name "xvid")
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-25 11:07 ` Taylan Ulrich Bayırlı/Kammer
@ 2015-03-25 16:47 ` Ludovic Courtès
2015-03-25 19:36 ` Taylan Ulrich Bayırlı/Kammer
0 siblings, 1 reply; 16+ messages in thread
From: Ludovic Courtès @ 2015-03-25 16:47 UTC (permalink / raw)
To: Taylan Ulrich "Bayırlı/Kammer"; +Cc: guix-devel
taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:
> So I patched the pkg-config files of Leptonica (to move zlib and
> openjpeg from Libs.private to Libs) and Tesseract (to enable the
> Requires field, since Leptonica provides lept.pc on the meanwhile).
>
> The relevant Tesseract bug report is at:
> https://code.google.com/p/tesseract-ocr/issues/detail?id=1436
OK. Could you add a link to this as a comment?
> From 41e485e47749119afc039796e88fcf8f787eeabc Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
> <taylanbayirli@gmail.com>
> Date: Sat, 21 Mar 2015 19:41:54 +0100
> Subject: [PATCH 4/8] gnu: Add leptonica.
>
> * gnu/packages/image.scm (leptonica): New variable.
[...]
> + (uri (string-append "http://www.leptonica.com/source/leptonica-"
> + version ".tar.gz"))
Really, they didn’t use ‘make dist’?
> + (sha256
> + (base32 "0j5qgrff6im5n9waflbi7w643q1p6mahyf2z35gb4vj9h5p76pfc"))
> + (modules '((guix build utils)))
> + ;; zlib and openjpg should be under Libs, not Libs.private.
Link to the bug report.
OK to push changes. I wonder if (gnu packages graphics) would be more
appropriate. Your call.
> From d12b1999a228d34e76cb93cba1a75cf7d18176bd Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
> <taylanbayirli@gmail.com>
> Date: Sat, 21 Mar 2015 20:11:56 +0100
> Subject: [PATCH 6/8] gnu: Add tesseract-ocr.
>
> * gnu/packages/ocr.scm (tesseract-ocr): New variable.
[...]
> + ;; Leptonica provides a pkg-config file on the meanwhile.
s/provides/added/ s/on/in/
OK.
> From 4c8af1741208f2d65e8ca9f3a37df38eb93a4b2d Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
> <taylanbayirli@gmail.com>
> Date: Sat, 21 Mar 2015 23:09:11 +0100
> Subject: [PATCH 7/8] gnu: Add vapoursynth.
>
> * gnu/packages/video.scm (vapoursynth): New variable.
LGTM!
Ludo’.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-22 11:52 [PATCHES] Various Taylan Ulrich Bayırlı/Kammer
2015-03-25 11:07 ` Taylan Ulrich Bayırlı/Kammer
@ 2015-03-25 16:50 ` Ludovic Courtès
2015-03-25 19:44 ` Taylan Ulrich Bayırlı/Kammer
1 sibling, 1 reply; 16+ messages in thread
From: Ludovic Courtès @ 2015-03-25 16:50 UTC (permalink / raw)
To: Taylan Ulrich "Bayırlı/Kammer"; +Cc: guix-devel
taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:
> From 2474d2e4818975255e02dd2d17496faf5ff42755 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
> <taylanbayirli@gmail.com>
> Date: Fri, 20 Mar 2015 15:52:52 +0100
> Subject: [PATCH 1/8] gnu: Add libva.
>
> * gnu/packages/video.scm (libva): New variable.
[...]
> + (synopsis "Video Acceleration API")
I know that it’s the upstream name, but really, it’s a library, not an
interface. So what about “Video acceleration library”?
Other than that, fine with me.
> From a82ac3f13f71764405575df875409e375fb71b03 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
> <taylanbayirli@gmail.com>
> Date: Sat, 21 Mar 2015 19:36:25 +0100
> Subject: [PATCH 2/8] gnu: freeglut: Add mesa to propagated inputs.
>
> * gnu/packages/gl.scm (freeglut): Add mesa to propagated inputs.
OK.
> From f74b6c39b8b6f90fe4dbe19c925cf703c82e3d59 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
> <taylanbayirli@gmail.com>
> Date: Sat, 21 Mar 2015 19:40:21 +0100
> Subject: [PATCH 3/8] gnu: Add libwebp.
>
> * gnu/packages/image.scm (freeimage): New variable.
Typo.
Other than that OK.
> From a37984a20b50d8be8ec3d1a9cd01a7f08057c9bc Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
> <taylanbayirli@gmail.com>
> Date: Fri, 20 Mar 2015 16:22:34 +0100
> Subject: [PATCH 5/8] gnu: Rename (gnu packages ocrad) to (gnu packages ocr).
>
> * gnu/packages/ocrad.scm: Deleted.
> * gnu/packages/ocr.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Change ocrad.scm to ocr.scm.
[...]
> -(define-module (gnu packages ocrad)
Change the module name.
OK with this change!
Thank you!
Ludo’.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-25 16:47 ` Ludovic Courtès
@ 2015-03-25 19:36 ` Taylan Ulrich Bayırlı/Kammer
2015-03-25 20:44 ` Ludovic Courtès
0 siblings, 1 reply; 16+ messages in thread
From: Taylan Ulrich Bayırlı/Kammer @ 2015-03-25 19:36 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
ludo@gnu.org (Ludovic Courtès) writes:
>> + (uri (string-append "http://www.leptonica.com/source/leptonica-"
>> + version ".tar.gz"))
>
> Really, they didn’t use ‘make dist’?
I don't understand; what does make dist do differently?
Thanks for the review!
Taylan
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-25 16:50 ` Ludovic Courtès
@ 2015-03-25 19:44 ` Taylan Ulrich Bayırlı/Kammer
0 siblings, 0 replies; 16+ messages in thread
From: Taylan Ulrich Bayırlı/Kammer @ 2015-03-25 19:44 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
ludo@gnu.org (Ludovic Courtès) writes:
>> + (synopsis "Video Acceleration API")
>
> I know that it’s the upstream name, but really, it’s a library, not an
> interface. So what about “Video acceleration library”?
Indeed, done.
>> Subject: [PATCH 3/8] gnu: Add libwebp.
>>
>> * gnu/packages/image.scm (freeimage): New variable.
>
> Typo.
In fact, Magit bug. :-) (It automates adding those lines.)
Thanks for the review!
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-25 19:36 ` Taylan Ulrich Bayırlı/Kammer
@ 2015-03-25 20:44 ` Ludovic Courtès
2015-03-25 21:22 ` Taylan Ulrich Bayırlı/Kammer
0 siblings, 1 reply; 16+ messages in thread
From: Ludovic Courtès @ 2015-03-25 20:44 UTC (permalink / raw)
To: Taylan Ulrich "Bayırlı/Kammer"; +Cc: guix-devel
taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:
> ludo@gnu.org (Ludovic Courtès) writes:
>
>>> + (uri (string-append "http://www.leptonica.com/source/leptonica-"
>>> + version ".tar.gz"))
>>
>> Really, they didn’t use ‘make dist’?
>
> I don't understand; what does make dist do differently?
A tarball generated by ‘make dist’ (like most tarballs of GNU packages)
already has a ‘configure’ script and Makefile templates; thus it doesn’t
depend on Autoconf, Automake, etc.
However, this package recipe explicitly adds Autoconf, Automake, and
Libtool as inputs, plus it runs ‘autoreconf’. So I suspect this is
because upstream’s tarball isn’t self-contained, right?
Ludo’.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-25 20:44 ` Ludovic Courtès
@ 2015-03-25 21:22 ` Taylan Ulrich Bayırlı/Kammer
2015-03-26 12:38 ` Ludovic Courtès
0 siblings, 1 reply; 16+ messages in thread
From: Taylan Ulrich Bayırlı/Kammer @ 2015-03-25 21:22 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
ludo@gnu.org (Ludovic Courtès) writes:
> taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:
>
>> ludo@gnu.org (Ludovic Courtès) writes:
>>
>>>> + (uri (string-append "http://www.leptonica.com/source/leptonica-"
>>>> + version ".tar.gz"))
>>>
>>> Really, they didn’t use ‘make dist’?
>>
>> I don't understand; what does make dist do differently?
>
> A tarball generated by ‘make dist’ (like most tarballs of GNU packages)
> already has a ‘configure’ script and Makefile templates; thus it doesn’t
> depend on Autoconf, Automake, etc.
>
> However, this package recipe explicitly adds Autoconf, Automake, and
> Libtool as inputs, plus it runs ‘autoreconf’. So I suspect this is
> because upstream’s tarball isn’t self-contained, right?
>
> Ludo’.
Oh, I did that because otherwise I get the following at start of the
build phase:
(CDPATH="${ZSH_VERSION+.}:" && cd . && /gnu/store/nq6idcqwqc9x6z7g9jxq11a58jqx6w8x-bash-4.3.33/bin/bash /tmp/nix-build-leptonica-1.71.drv-1/leptonica-1.71/config/missing --run autoheader)
aclocal.m4:17: warning: this file was generated for autoconf 2.68.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.
However, it seems to build fine in the end. Should I remove the
autoreconf phase?
Taylan
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-25 21:22 ` Taylan Ulrich Bayırlı/Kammer
@ 2015-03-26 12:38 ` Ludovic Courtès
2015-03-26 21:04 ` Taylan Ulrich Bayırlı/Kammer
0 siblings, 1 reply; 16+ messages in thread
From: Ludovic Courtès @ 2015-03-26 12:38 UTC (permalink / raw)
To: Taylan Ulrich "Bayırlı/Kammer"; +Cc: guix-devel
taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:
> ludo@gnu.org (Ludovic Courtès) writes:
>
>> taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:
>>
>>> ludo@gnu.org (Ludovic Courtès) writes:
>>>
>>>>> + (uri (string-append "http://www.leptonica.com/source/leptonica-"
>>>>> + version ".tar.gz"))
>>>>
>>>> Really, they didn’t use ‘make dist’?
>>>
>>> I don't understand; what does make dist do differently?
>>
>> A tarball generated by ‘make dist’ (like most tarballs of GNU packages)
>> already has a ‘configure’ script and Makefile templates; thus it doesn’t
>> depend on Autoconf, Automake, etc.
>>
>> However, this package recipe explicitly adds Autoconf, Automake, and
>> Libtool as inputs, plus it runs ‘autoreconf’. So I suspect this is
>> because upstream’s tarball isn’t self-contained, right?
>>
>> Ludo’.
>
> Oh, I did that because otherwise I get the following at start of the
> build phase:
>
> (CDPATH="${ZSH_VERSION+.}:" && cd . && /gnu/store/nq6idcqwqc9x6z7g9jxq11a58jqx6w8x-bash-4.3.33/bin/bash /tmp/nix-build-leptonica-1.71.drv-1/leptonica-1.71/config/missing --run autoheader)
> aclocal.m4:17: warning: this file was generated for autoconf 2.68.
This may be because a .ac, .am, or .m4 file is newer than ‘configure’,
for instance. Does any of these get patched, which would explain the
newer mtime? Can it be worked around by changing that file’s mtime
using ‘set-file-time’ or similar?
> You have another version of autoconf. It may work, but is not guaranteed to.
> If you have problems, you may need to regenerate the build system entirely.
> To do so, use the procedure documented by the package, typically `autoreconf'.
>
> However, it seems to build fine in the end. Should I remove the
> autoreconf phase?
If it’s not needed then yes, definitely. The important thing would be
to remove autoconf, automake, and libtool from the inputs though.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-26 12:38 ` Ludovic Courtès
@ 2015-03-26 21:04 ` Taylan Ulrich Bayırlı/Kammer
2015-03-26 21:08 ` Ludovic Courtès
0 siblings, 1 reply; 16+ messages in thread
From: Taylan Ulrich Bayırlı/Kammer @ 2015-03-26 21:04 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1152 bytes --]
ludo@gnu.org (Ludovic Courtès) writes:
>>> However, this package recipe explicitly adds Autoconf, Automake, and
>>> Libtool as inputs, plus it runs ‘autoreconf’. So I suspect this is
>>> because upstream’s tarball isn’t self-contained, right?
>>>
>>> Ludo’.
>>
>> Oh, I did that because otherwise I get the following at start of the
>> build phase:
>>
>> (CDPATH="${ZSH_VERSION+.}:" && cd . && /gnu/store/nq6idcqwqc9x6z7g9jxq11a58jqx6w8x-bash-4.3.33/bin/bash /tmp/nix-build-leptonica-1.71.drv-1/leptonica-1.71/config/missing --run autoheader)
>> aclocal.m4:17: warning: this file was generated for autoconf 2.68.
>
> This may be because a .ac, .am, or .m4 file is newer than ‘configure’,
> for instance. Does any of these get patched, which would explain the
> newer mtime? Can it be worked around by changing that file’s mtime
> using ‘set-file-time’ or similar?
I get the warning even if I just run "./configure && make", outside of
Guix. The reason seems to be config/config.h.in being old; touching it
suppresses the warning, and the build still succeeds. Is it fine this
way?
Updated patch:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0004-gnu-Add-leptonica.patch --]
[-- Type: text/x-diff, Size: 3418 bytes --]
From 5d6d90da79d5eac8568d3c868979866965912154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sat, 21 Mar 2015 19:41:54 +0100
Subject: [PATCH 4/8] gnu: Add leptonica.
* gnu/packages/image.scm (leptonica): New variable.
---
gnu/packages/image.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 9c7e504..15f4339 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -24,6 +24,7 @@
(define-module (gnu packages image)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
#:use-module (gnu packages compression)
#:use-module (gnu packages doxygen)
@@ -164,6 +165,65 @@ the W3C's XML-based Scaleable Vector Graphic (SVG) format.")
;; 'COPYING' is the GPLv2, but file headers say LGPLv2.0+.
(license license:lgpl2.0+)))
+(define-public leptonica
+ (package
+ (name "leptonica")
+ (version "1.71")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://www.leptonica.com/source/leptonica-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "0j5qgrff6im5n9waflbi7w643q1p6mahyf2z35gb4vj9h5p76pfc"))
+ (modules '((guix build utils)))
+ ;; zlib and openjpg should be under Libs, not Libs.private. See:
+ ;; https://code.google.com/p/tesseract-ocr/issues/detail?id=1436
+ (snippet
+ '(substitute* "lept.pc.in"
+ (("^(Libs\\.private: .*)@ZLIB_LIBS@(.*)" all pre post)
+ (string-append pre post))
+ (("^(Libs\\.private: .*)@JPEG_LIBS@(.*)" all pre post)
+ (string-append pre post))
+ (("^Libs: .*" all)
+ (string-append all " @ZLIB_LIBS@ @JPEG_LIBS@"))))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("gnuplot" ,gnuplot))) ;needed for test suite
+ (inputs
+ `(("giflib" ,giflib)
+ ("libjpeg" ,libjpeg)
+ ("libpng" ,libpng)
+ ("libtiff" ,libtiff)
+ ("libwebp" ,libwebp)))
+ (propagated-inputs
+ `(("openjpeg" ,openjpeg)
+ ("zlib" ,zlib)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ ;; Prevent make from trying to regenerate config.h.in.
+ (add-after
+ unpack touch-config-h-in
+ (lambda _
+ (zero? (system* "touch" "config/config.h.in"))))
+ (add-after
+ unpack patch-reg-wrapper
+ (lambda _
+ (substitute* "prog/reg_wrapper.sh"
+ ((" /bin/sh ")
+ (string-append " " (which "sh") " "))))))))
+ (home-page "http://www.leptonica.com/")
+ (synopsis "Library and tools for image processing and analysis")
+ (description
+ "Leptonica is a C library and set of command-line tools for efficient
+image processing and image analysis operations. It supports rasterop, affine
+transformations, binary and grayscale morphology, rank order, and convolution,
+seedfill and connected components, image transformations combining changes in
+scale and pixel depth, and pixelwise masking, blending, enhancement, and
+arithmetic ops.")
+ (license license:bsd-2)))
+
(define-public jbig2dec
(package
(name "jbig2dec")
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-26 21:04 ` Taylan Ulrich Bayırlı/Kammer
@ 2015-03-26 21:08 ` Ludovic Courtès
2015-03-26 21:16 ` Taylan Ulrich Bayırlı/Kammer
0 siblings, 1 reply; 16+ messages in thread
From: Ludovic Courtès @ 2015-03-26 21:08 UTC (permalink / raw)
To: Taylan Ulrich "Bayırlı/Kammer"; +Cc: guix-devel
taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:
> ludo@gnu.org (Ludovic Courtès) writes:
[...]
>> This may be because a .ac, .am, or .m4 file is newer than ‘configure’,
>> for instance. Does any of these get patched, which would explain the
>> newer mtime? Can it be worked around by changing that file’s mtime
>> using ‘set-file-time’ or similar?
>
> I get the warning even if I just run "./configure && make", outside of
> Guix. The reason seems to be config/config.h.in being old; touching it
> suppresses the warning, and the build still succeeds. Is it fine this
> way?
Yes.
> + (lambda _
> + (zero? (system* "touch" "config/config.h.in"))))
Would this work:
(set-file-time "config/config.h.in" (stat "config/config.h"))
?
It would be preferable because independent of the system time, but no
big deal.
OK to push one way or the other.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-26 21:08 ` Ludovic Courtès
@ 2015-03-26 21:16 ` Taylan Ulrich Bayırlı/Kammer
2015-03-28 12:28 ` Taylan Ulrich Bayırlı/Kammer
0 siblings, 1 reply; 16+ messages in thread
From: Taylan Ulrich Bayırlı/Kammer @ 2015-03-26 21:16 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
ludo@gnu.org (Ludovic Courtès) writes:
> (set-file-time "config/config.h.in" (stat "config/config.h"))
There's no "config/config.h", even after the configure phase. Is it
fine to use (stat "configure") instead?
Taylan
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-26 21:16 ` Taylan Ulrich Bayırlı/Kammer
@ 2015-03-28 12:28 ` Taylan Ulrich Bayırlı/Kammer
2015-03-29 13:12 ` Ludovic Courtès
0 siblings, 1 reply; 16+ messages in thread
From: Taylan Ulrich Bayırlı/Kammer @ 2015-03-28 12:28 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") writes:
> ludo@gnu.org (Ludovic Courtès) writes:
>
>> (set-file-time "config/config.h.in" (stat "config/config.h"))
>
> There's no "config/config.h", even after the configure phase. Is it
> fine to use (stat "configure") instead?
I went forth and pushed this (along with the others).
Thanks for the tutoring, as always. :-)
Taylan
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCHES] Various
2015-03-28 12:28 ` Taylan Ulrich Bayırlı/Kammer
@ 2015-03-29 13:12 ` Ludovic Courtès
0 siblings, 0 replies; 16+ messages in thread
From: Ludovic Courtès @ 2015-03-29 13:12 UTC (permalink / raw)
To: Taylan Ulrich "Bayırlı/Kammer"; +Cc: guix-devel
taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:
> taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") writes:
>
>> ludo@gnu.org (Ludovic Courtès) writes:
>>
>>> (set-file-time "config/config.h.in" (stat "config/config.h"))
>>
>> There's no "config/config.h", even after the configure phase. Is it
>> fine to use (stat "configure") instead?
>
> I went forth and pushed this (along with the others).
OK, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2015-03-29 13:12 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-22 11:52 [PATCHES] Various Taylan Ulrich Bayırlı/Kammer
2015-03-25 11:07 ` Taylan Ulrich Bayırlı/Kammer
2015-03-25 16:47 ` Ludovic Courtès
2015-03-25 19:36 ` Taylan Ulrich Bayırlı/Kammer
2015-03-25 20:44 ` Ludovic Courtès
2015-03-25 21:22 ` Taylan Ulrich Bayırlı/Kammer
2015-03-26 12:38 ` Ludovic Courtès
2015-03-26 21:04 ` Taylan Ulrich Bayırlı/Kammer
2015-03-26 21:08 ` Ludovic Courtès
2015-03-26 21:16 ` Taylan Ulrich Bayırlı/Kammer
2015-03-28 12:28 ` Taylan Ulrich Bayırlı/Kammer
2015-03-29 13:12 ` Ludovic Courtès
2015-03-25 16:50 ` Ludovic Courtès
2015-03-25 19:44 ` Taylan Ulrich Bayırlı/Kammer
-- strict thread matches above, loose matches on Subject: below --
2015-03-07 18:24 Taylan Ulrich Bayırlı/Kammer
2015-03-09 9:14 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).