diff --git a/gnu-system.am b/gnu-system.am
index d60371bcbf08b8e18326e286d9899c11ae1885b5..31d664e1168460bb9b94376cba80af47becfcb81 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 df5b1e337c61f36e3d4346c7ee86a9fb1cacd75f..52a434a61c80faf1ce5a53d2d1997fc932077223 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -28,10 +28,10 @@ (define-module (gnu packages gnunet)
#: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 dacbe31a3111659c4b93fef1b25c1fb4185787f1..1106a8aa83bc657fbfd1d0eddeb15556fa3fcd68 100644
--- a/gnu/packages/libcanberra.scm
+++ b/gnu/packages/libcanberra.scm
@@ -25,8 +25,8 @@ (define-module (gnu packages libcanberra)
#: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 73cbf40fac90fb85f4cd30bb90fe9f9ca9a525f3..7e324703a6aa630cf40a9bb9772923eaa32eb72b 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -23,13 +23,13 @@ (define-module (gnu packages mp3)
#: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 91bbe2d77af6abd6fcad76543d48d4b48fd8e189..8bf48c2a89637a16b42409c698019702e0f7df3f 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -23,18 +23,18 @@ (define-module (gnu packages pulseaudio)
#: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 86b403503ba566b275df682beda00a5044063b5e..25ae1b0721c4324ddf2ab4ef14ce5a18ad961191 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -28,10 +28,10 @@ (define-module (gnu packages sdl)
#: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 b1d1270c05f282a4515d3f9790ce0e127095f46a..8e4315a880d3aef89c270c764d4cc55671fda396 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -25,11 +25,11 @@ (define-module (gnu packages video)
#: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 0bce731f45024553fa33adabbc8399655d6fede7..6bd66580358d2a18b8c2d4271cc6b5ad24b66566 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 <http://www.gnu.org/licenses/>.
-(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 @@ (define ao
;; 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)))