From 54ff0b7dd7e68fa50dbea7a2d335c98fc60057d4 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 23 Jan 2014 19:05:09 +0100 Subject: [PATCH] gnu: Rename (gnu packages oggvorbis) to (gnu packages xiph). * gnu/packages/oggvorbis.scm: Rename this ... * gnu/packages/xiph.scm: ... to this. Adjust module name accordingly. * gnu-system.am (GNU_SYSTEM_MODULES): Update. * gnu/packages/{gnunet.scm, libcanberra.scm, mp3.scm, pulseaudio.scm, sdl.scm, video.scm}: Use new module name. --- gnu-system.am | 2 +- gnu/packages/gnunet.scm | 2 +- gnu/packages/libcanberra.scm | 4 ++-- gnu/packages/mp3.scm | 4 ++-- gnu/packages/pulseaudio.scm | 14 +++++++------- gnu/packages/sdl.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/{oggvorbis.scm => xiph.scm} | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) rename gnu/packages/{oggvorbis.scm => xiph.scm} (99%) diff --git a/gnu-system.am b/gnu-system.am index d60371bcbf..31d664e116 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -147,7 +147,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/noweb.scm \ gnu/packages/ocaml.scm \ gnu/packages/ocrad.scm \ - gnu/packages/oggvorbis.scm \ gnu/packages/onc-rpc.scm \ gnu/packages/openldap.scm \ gnu/packages/openssl.scm \ @@ -205,6 +204,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/wget.scm \ gnu/packages/which.scm \ gnu/packages/wordnet.scm \ + gnu/packages/xiph.scm \ gnu/packages/xlockmore.scm \ gnu/packages/xml.scm \ gnu/packages/xnee.scm \ diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index df5b1e337c..52a434a61c 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -28,10 +28,10 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages libjpeg) #:use-module (gnu packages libtiff) - #:use-module (gnu packages oggvorbis) #:use-module (gnu packages openssl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages video) + #:use-module (gnu packages xiph) #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:)) #:use-module (guix packages) diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index dacbe31a31..1106a8aa83 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -25,8 +25,8 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages linux) - #:use-module (gnu packages oggvorbis) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xiph)) (define-public libcanberra (package diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 73cbf40fac..7e324703a6 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -23,13 +23,13 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages cdrom) #:use-module (gnu packages compression) + #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) - #:use-module (gnu packages oggvorbis) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages gettext) + #:use-module (gnu packages xiph) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 91bbe2d77a..8bf48c2a89 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -23,18 +23,18 @@ #:renamer (symbol-prefix-proc 'l:)) #:use-module (guix build-system gnu) #:use-module (gnu packages) - #:use-module (gnu packages linux) - #:use-module (gnu packages oggvorbis) - #:use-module (gnu packages pkg-config) + #:use-module (gnu packages algebra) + #:use-module ((gnu packages autotools) #:select (libtool)) #:use-module (gnu packages avahi) + #:use-module (gnu packages check) + #:use-module (gnu packages gdbm) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages libcanberra) - #:use-module (gnu packages algebra) - #:use-module ((gnu packages autotools) #:select (libtool)) - #:use-module (gnu packages gdbm) + #:use-module (gnu packages linux) #:use-module (gnu packages m4) - #:use-module (gnu packages check) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xiph) #:export (libsndfile libsamplerate json-c diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 86b403503b..25ae1b0721 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -28,10 +28,10 @@ #:use-module (gnu packages libtiff) #:use-module (gnu packages linux) #:use-module (gnu packages mp3) - #:use-module (gnu packages oggvorbis) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages gl) + #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:export (sdl sdl2 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b1d1270c05..8e4315a880 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -25,11 +25,11 @@ #:use-module (gnu packages compression) #:use-module (gnu packages elf) #:use-module (gnu packages fontutils) - #:use-module (gnu packages oggvorbis) #:use-module (gnu packages openssl) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages xiph) #:use-module (gnu packages yasm)) (define-public ffmpeg diff --git a/gnu/packages/oggvorbis.scm b/gnu/packages/xiph.scm similarity index 99% rename from gnu/packages/oggvorbis.scm rename to gnu/packages/xiph.scm index 0bce731f45..6bd6658035 100644 --- a/gnu/packages/oggvorbis.scm +++ b/gnu/packages/xiph.scm @@ -18,7 +18,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (gnu packages oggvorbis) +(define-module (gnu packages xiph) #:use-module (gnu packages) #:use-module (gnu packages bison) #:use-module (gnu packages compression) @@ -155,7 +155,7 @@ stereo encoding, and voice activity detection.") ;; FIXME: Add further backends, see the summary printed after configure. ;; XXX: Should back-ends be pushed to different outputs? For instance, ;; "out" would include only the ALSA back-end, while "pulse" would - ;; contains 'lib/ao/plugins-4/libpulse.*'. + ;; contain 'lib/ao/plugins-4/libpulse.*'. (inputs `(("pkg-config" ,pkg-config) ("alsa-lib" ,alsa-lib) ("pulseaudio" ,pulseaudio))) -- 2.20.1