summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnu/packages/animation.scm6
-rw-r--r--gnu/packages/astronomy.scm2
-rw-r--r--gnu/packages/education.scm8
-rw-r--r--gnu/packages/emulators.scm2
-rw-r--r--gnu/packages/engineering.scm2
-rw-r--r--gnu/packages/games.scm8
-rw-r--r--gnu/packages/graphics.scm2
-rw-r--r--gnu/packages/irc.scm2
-rw-r--r--gnu/packages/jami.scm2
-rw-r--r--gnu/packages/kde-frameworks.scm2
-rw-r--r--gnu/packages/kde-multimedia.scm6
-rw-r--r--gnu/packages/kde.scm6
-rw-r--r--gnu/packages/messaging.scm12
-rw-r--r--gnu/packages/mpd.scm2
-rw-r--r--gnu/packages/music.scm8
-rw-r--r--gnu/packages/networking.scm2
-rw-r--r--gnu/packages/qt.scm19
-rw-r--r--gnu/packages/radio.scm14
-rw-r--r--gnu/packages/text-editors.scm4
-rw-r--r--gnu/packages/video.scm6
-rw-r--r--gnu/packages/web-browsers.scm2
21 files changed, 59 insertions, 58 deletions
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 89079ceb6e..c7f80a4b6a 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -435,7 +435,7 @@ language.")
(add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (qt '("qt" "qtmultimedia")))
+ (qt '("qt" "qtmultimedia-5")))
(wrap-program (string-append out "/bin/Papagayo")
`("QT_PLUGIN_PATH" ":" prefix
,(map (lambda (label)
@@ -445,7 +445,7 @@ language.")
#t))))))
(inputs
`(("qt" ,qtbase-5)
- ("qtmultimedia" ,qtmultimedia)
+ ("qtmultimedia-5" ,qtmultimedia-5)
("libsndfile" ,libsndfile)))
(native-inputs
(list qttools))
@@ -474,7 +474,7 @@ waveform until they line up with the proper sounds.")
"0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh"))))
(build-system gnu-build-system)
(inputs
- (list qtbase-5 qtxmlpatterns qtmultimedia qtsvg-5))
+ (list qtbase-5 qtxmlpatterns qtmultimedia-5 qtsvg-5))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index e84eb188ff..95659104ce 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -607,7 +607,7 @@ deconvolution). Such post-processing is not performed by Stackistry.")
(inputs
(list qtbase-5
qtlocation
- qtmultimedia
+ qtmultimedia-5
qtscript
qtserialport
zlib))
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 0e3c8feaf9..998867918e 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -182,7 +182,7 @@ of categories with some of the activities available in that category.
qtbase-5
qtdeclarative
qtgraphicaleffects
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols
qtsensors
qtsvg-5
@@ -302,7 +302,7 @@ frequently used words in American English.")
;; Recreate Makefile
(invoke "qmake")))))))
(inputs
- (list qtbase-5 qtmultimedia))
+ (list qtbase-5 qtmultimedia-5))
(home-page "https://www.tipp10.com/")
(synopsis "Touch typing tutor")
(description "Tipp10 is a touch typing tutor. The ingenious thing about
@@ -559,7 +559,7 @@ specialized device.")
poppler
qtbase-5
qtdeclarative
- qtmultimedia
+ qtmultimedia-5
qtsvg-5
qtwebchannel
qtwebengine
@@ -995,7 +995,7 @@ formats.")
(inputs
(list libeb
qtbase-5
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols2
qtdeclarative
qtwebchannel
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 5cff92ac89..ba7fa1dbe2 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -755,7 +755,7 @@ The following systems are supported:
minizip
ncurses
qtbase-5
- qtmultimedia
+ qtmultimedia-5
sdl2
sqlite
zlib))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 8037ccb565..bcf024e437 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2356,7 +2356,7 @@ specification can be downloaded at @url{http://3mf.io/specification/}.")
("opencsg" ,opencsg)
("qscintilla" ,qscintilla)
("qtbase" ,qtbase-5)
- ("qtmultimedia" ,qtmultimedia)))
+ ("qtmultimedia-5" ,qtmultimedia-5)))
(native-inputs
`(("bison" ,bison)
("flex" ,flex)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index cc246551a3..ceac1d3390 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -993,7 +993,7 @@ want what you have.")
(inputs
(list protobuf
qtbase-5
- qtmultimedia
+ qtmultimedia-5
qtsvg-5
qttools
qtwebsockets
@@ -10153,7 +10153,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
(native-inputs
(list pkg-config))
(inputs
- (list qtbase-5 qtmultimedia qtsvg-5))
+ (list qtbase-5 qtmultimedia-5 qtsvg-5))
(arguments
'(#:phases
(modify-phases %standard-phases
@@ -10247,7 +10247,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
libkdegames
python-wrapper
qtbase-5
- qtmultimedia
+ qtmultimedia-5
qtdeclarative
qtsvg-5))
(home-page "https://games.kde.org/")
@@ -11885,7 +11885,7 @@ and chess engines.")
(native-inputs
(list qttools))
(inputs
- (list qtbase-5 qtmultimedia qtspeech qtsvg-5 zlib))
+ (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib))
(arguments
`(#:tests? #f
#:phases
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 915d9d79e1..f7307e8f61 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1965,7 +1965,7 @@ Automated palette selection is supported.")
;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason
qtbase-5
qtkeychain
- qtmultimedia
+ qtmultimedia-5
qtsvg-5
qtx11extras))
(home-page "https://drawpile.net")
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index e7ace9e6c4..67a86cbfc1 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -134,7 +134,7 @@
perl
qca
qtbase-5
- qtmultimedia
+ qtmultimedia-5
qtscript
qtsvg-5
snorenotify
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 726221b1e5..8f4c56842b 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -607,7 +607,7 @@ decentralized calling using P2P-DHT.")
qtsvg-5
qtwebengine
qtwebchannel
- qtmultimedia
+ qtmultimedia-5
qtdeclarative
qtgraphicaleffects
qtquickcontrols
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 0f1799edb2..3dffcdf813 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1715,7 +1715,7 @@ from DocBook files.")
karchive
kcoreaddons
ki18n
- qtmultimedia
+ qtmultimedia-5
qtbase-5
;; Required run-time packages
catdoc
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 5b0d841445..b60b4ee489 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -174,7 +174,7 @@ This package is part of the KDE multimedia module.")
qtbase-5
qtdeclarative
qtgraphicaleffects ; not listed as dependency
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols
qtquickcontrols2
qtsvg-5
@@ -336,7 +336,7 @@ This package is part of the KDE multimedia module.")
libvorbis
qtbase-5
qtdeclarative
- qtmultimedia
+ qtmultimedia-5
readline
taglib
zlib))
@@ -698,7 +698,7 @@ Some features:
oxygen-icons ; default icon set
pulseaudio
qtbase-5
- qtmultimedia
+ qtmultimedia-5
zlib))
(home-page "https://kde.org/applications/multimedia/org.kde.kwave")
(synopsis "Sound editor for KDE")
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 2dfd1348e7..ff02723ab1 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -287,7 +287,7 @@ browser for easy news reading.")
qtbase-5
qtdeclarative
qtgraphicaleffects
- qtmultimedia
+ qtmultimedia-5
qtnetworkauth
qtquickcontrols
qtquickcontrols2
@@ -540,7 +540,7 @@ expression library, that is used in Krita.")
poppler-qt5
qtbase-5
qtdeclarative
- qtmultimedia
+ qtmultimedia-5
qtsvg-5
qtx11extras
quazip-0
@@ -747,7 +747,7 @@ different notification systems.")
qtbase-5
qtdeclarative
qtgraphicaleffects
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols
qtquickcontrols2
qtx11extras))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 07f6bc17cb..77aba8ee8a 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -232,7 +232,7 @@ XMPP-based sessions.")
("libidn" ,libidn)
("qca" ,qca)
("qtbase" ,qtbase-5)
- ("qtmultimedia" ,qtmultimedia)
+ ("qtmultimedia-5" ,qtmultimedia-5)
("qtsvg-5" ,qtsvg-5)
("qtwebkit" ,qtwebkit)
("qtx11extras" ,qtx11extras)
@@ -1481,7 +1481,7 @@ default.")
qtlocation
qtquickcontrols2
qtsvg-5
- qtmultimedia
+ qtmultimedia-5
qtxmlpatterns
qqc2-desktop-style
qxmpp
@@ -2325,7 +2325,7 @@ notifications, and Python scripting support.")
(base32 "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs"))))
(build-system cmake-build-system)
(inputs
- (list qtbase-5 qtmultimedia))
+ (list qtbase-5 qtmultimedia-5))
(arguments
`(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON")
#:tests? #f)) ; no tests
@@ -2460,7 +2460,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.")
qtdeclarative
qtkeychain
qtgraphicaleffects
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols2
qtsvg-5
spdlog
@@ -2498,7 +2498,7 @@ notification, emojis, E2E encryption, and voip calls.")
(list libqmatrixclient
qtbase-5
qtdeclarative
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols
qtquickcontrols2
qtsvg-5
@@ -3040,7 +3040,7 @@ social and chat platform.")
("qite" ,qite)
("qtbase" ,qtbase-5)
("qtkeychain" ,qtkeychain)
- ("qtmultimedia" ,qtmultimedia)
+ ("qtmultimedia-5" ,qtmultimedia-5)
("qtsvg-5" ,qtsvg-5)
("qtx11extras" ,qtx11extras)
("usrsctp" ,usrsctp)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index e83c78e4d2..046471f32d 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -463,7 +463,7 @@ support")
libmtp
mpg123
qtbase-5
- qtmultimedia
+ qtmultimedia-5
qtsvg-5
taglib
zlib))
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 2246da84be..c413be2bb3 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -253,7 +253,7 @@
(inputs
(list dbus
qtbase-5
- qtmultimedia
+ qtmultimedia-5
;; Plugin dependencies
alsa-lib
curl
@@ -5550,12 +5550,12 @@ discard bad quality ones.
,(map (lambda (label)
(string-append (assoc-ref inputs label)
"/lib/qt5/plugins"))
- '("qtbase" "qtmultimedia" "qtsvg-5")))
+ '("qtbase" "qtmultimedia-5" "qtsvg-5")))
`("QML2_IMPORT_PATH" ":" prefix
,(map (lambda (label)
(string-append (assoc-ref inputs label)
"/lib/qt5/qml"))
- '("qtmultimedia"))))
+ '("qtmultimedia-5"))))
#t))))))
(inputs
(list alsa-lib
@@ -5563,7 +5563,7 @@ discard bad quality ones.
jack-1
portaudio
qtbase-5
- qtmultimedia
+ qtmultimedia-5
qtsvg-5))
(native-inputs
`(("gettext" ,gettext-minimal)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index c39123ddfa..7c6d0757ea 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1636,7 +1636,7 @@ of the same name.")
`(,nghttp2 "lib")
minizip
qtbase-5
- qtmultimedia
+ qtmultimedia-5
qtsvg-5
sbc
snappy
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 82c2d5fa23..461180c5a3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -140,7 +140,7 @@
(chdir "libqite")
#t)))))
(inputs
- (list qtbase-5 qtmultimedia))
+ (list qtbase-5 qtmultimedia-5))
(home-page "https://github.com/Ri0n/qite/")
(synopsis "Qt Interactive Text Elements")
(description "Qite manages interactive elements on QTextEdit.")
@@ -1126,8 +1126,9 @@ consume data received from the server, or both.")))
and C++ interfaces. The Qt Sensors API also provides a motion gesture
recognition API for devices.")))
-(define-public qtmultimedia
- (package (inherit qtsvg-5)
+(define-public qtmultimedia-5
+ (package
+ (inherit qtsvg-5)
(name "qtmultimedia")
(version "5.15.2")
(source (origin
@@ -1697,7 +1698,7 @@ processes or computers.")))
(inputs
(list qtbase-5))
(native-inputs
- (list perl qtdeclarative qtmultimedia qtxmlpatterns))
+ (list perl qtdeclarative qtmultimedia-5 qtxmlpatterns))
(synopsis "Qt Speech module")
(description "The Qt Speech module enables a Qt application to support
accessibility features such as text-to-speech, which is useful for end-users
@@ -2022,7 +2023,7 @@ using the Enchant spell-checking library.")
pulseaudio
qtbase-5
qtdeclarative
- qtmultimedia
+ qtmultimedia-5
qtwebchannel
re2
snappy
@@ -2261,7 +2262,7 @@ module provides support functions to the automatically generated code.")
("qtconnectivity" ,qtconnectivity)
("qtdeclarative" ,qtdeclarative)
("qtlocation" ,qtlocation)
- ("qtmultimedia" ,qtmultimedia)
+ ("qtmultimedia-5" ,qtmultimedia-5)
("qtsensors" ,qtsensors)
("qtserialport" ,qtserialport)
("qtsvg-5" ,qtsvg-5)
@@ -2842,7 +2843,7 @@ different kinds of sliders, and much more.")
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtlocation" ,qtlocation)
- ("qtmultimedia" ,qtmultimedia)
+ ("qtmultimedia-5" ,qtmultimedia-5)
("qtsensors" ,qtsensors)
("qtwebchannel" ,qtwebchannel)
("libxml2" ,libxml2)
@@ -3073,7 +3074,7 @@ color-related widgets.")
qtdatavis3d
qtdeclarative
qtlocation
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols
qtquickcontrols2
qtscript
@@ -3122,7 +3123,7 @@ color-related widgets.")
'("qtdatavis3d"
"qtdeclarative"
"qtlocation"
- "qtmultimedia"
+ "qtmultimedia-5"
"qtquickcontrols"
"qtquickcontrols2"
"qtscript"
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index d9f8e1002d..8749a2be0e 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1298,7 +1298,7 @@ instances over the network, and general QSO and DXpedition logging.")
("hamlib" ,wsjtx-hamlib)
("libusb" ,libusb)
("qtbase" ,qtbase-5)
- ("qtmultimedia" ,qtmultimedia)
+ ("qtmultimedia-5" ,qtmultimedia-5)
("qtserialport" ,qtserialport)))
(arguments
`(#:tests? #f)) ; No test suite
@@ -1337,7 +1337,7 @@ weak-signal conditions.")
libusb
qtbase-5
qtwebsockets
- qtmultimedia
+ qtmultimedia-5
qtserialport))
(arguments
`(#:tests? #f)) ; No test suite
@@ -1381,7 +1381,7 @@ focused on DXing and being shaped by community of DXers.JTDX")
("hamlib" ,wsjtx-hamlib)
("libusb" ,libusb)
("qtbase" ,qtbase-5)
- ("qtmultimedia" ,qtmultimedia)
+ ("qtmultimedia-5" ,qtmultimedia-5)
("qtserialport" ,qtserialport)))
(arguments
`(#:tests? #f ; No test suite
@@ -1747,7 +1747,7 @@ intended for people who want to learn receiving and sending morse code.")
(native-inputs
(list qttools))
(inputs
- (list qtbase-5 qtmultimedia))
+ (list qtbase-5 qtmultimedia-5))
(arguments
`(#:tests? #f)) ; No test suite
(home-page "https://dm3mat.darc.de/kochmorse/")
@@ -1930,7 +1930,7 @@ receiver.")
qtcharts
qtdeclarative
qtgraphicaleffects
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols2
soapysdr))
(arguments
@@ -2161,7 +2161,7 @@ voice formats.")
qtcharts
qtdeclarative
qtlocation
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols2
qtserialport
qtspeech
@@ -2293,7 +2293,7 @@ software-defined radio receivers.")
(base32 "1kpkwxhcacgmprbr8xz840rj9a22513vxrh2q7d3js5i1dva8j2z"))))
(build-system qt-build-system)
(inputs
- (list opus qcustomplot qtbase-5 qtmultimedia qtserialport))
+ (list opus qcustomplot qtbase-5 qtmultimedia-5 qtserialport))
(arguments
`(#:tests? #f ; No test suite.
#:phases
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 41e55db9c2..2e569ac17a 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -668,7 +668,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB.
(list hunspell
qtbase-5
qtdeclarative
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols
qtsvg-5
qtwebchannel))
@@ -695,7 +695,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB.
,(map (lambda (label)
(string-append (assoc-ref inputs label)
"/lib/qt5/plugins/"))
- '("qtsvg-5" "qtmultimedia"))))))))))
+ '("qtsvg-5" "qtmultimedia-5"))))))))))
(home-page "https://wereturtle.github.io/ghostwriter/")
(synopsis "Write without distractions")
(description
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c53cfe96d3..2ebbe8afcf 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1000,7 +1000,7 @@ H.264 (MPEG-4 AVC) video streams.")
pcre2
pugixml
qtbase-5
- qtmultimedia
+ qtmultimedia-5
utfcpp
zlib))
(native-inputs
@@ -4687,7 +4687,7 @@ create smoother and stable videos.")
jsoncpp
libopenshot-audio
qtbase-5
- qtmultimedia
+ qtmultimedia-5
zeromq))
(arguments
`(#:configure-flags
@@ -4859,7 +4859,7 @@ transitions, and effects and then export your film to many common formats.")
qtbase-5
qtdeclarative
qtgraphicaleffects
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols
qtquickcontrols2
qtsvg-5
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 1c308ffbdf..751478c3d1 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -453,7 +453,7 @@ access.")
font-openmoji
openssl
qtbase-5
- qtmultimedia
+ qtmultimedia-5
qtsvg-5))
(home-page "https://kristall.random-projects.net")
(synopsis "Small-internet graphical client")
generated by cgit v1.2.3 (git 2.46.2) at 2024-11-12 14:46:22 +0000