qt-speech was upstreamed

the previous patch for goldendict-ng couldn't get rid of the wrapper, it still relies heavily on environment variables to find other components

.gitignore

@@ -0,0 +1,8 @@
+# .gitignore
+
+# Ignore files that end with ~
+*~
+pinentry*
+*rej
+*orig
+*#

README.md

@@ -31,4 +31,4 @@ To update Ajatt Tools along with Guix via guix pull, insert the following into ~
 <br></br>
 ### Contributors
 
-<!-- contributors --> <a href="https://codeberg.org/hashirama"><img src="https://codeberg.org/avatars/cc776cef25c95b3e4c031cd4459b06be7f099a518dc60f4168dec79041eb3f71?size=512" width="60px" alt="" /></a> <a href="https://codeberg.org/anemofilia"><img src="https://codeberg.org/avatars/f30eb0cfbceeb010bbaf205d635916c1?size=512" width="60px" alt="" /></a> <a href="https://codeberg.org/crzjp"><img src="https://codeberg.org/avatars/55cf7daa6e277d5a1c7190901396f8be36130a9286a922b5ac24c4814161db14?size=512" width="60px" alt="" /></a>  <a href="https://gitlab.vulnix.sh/spacecadet"><img src="https://git.ajattix.org/hashirama/ajattix/raw/branch/main/misc/contributors/spacecadet.jpg" width="60px" alt="" /></a> <!-- contributors -->
+<!-- contributors --> <a href="https://codeberg.org/hashirama"><img src="https://git.ajattix.org/hashirama/ajattix/raw/branch/main/misc/contributors/hashirama.png" width="60px" alt="" /></a> <a href="https://codeberg.org/anemofilia"><img src="https://git.ajattix.org/hashirama/ajattix/raw/branch/main/misc/contributors/anemofilia.png" width="60px" alt="" /></a> <a href="https://codeberg.org/crzjp"><img src="https://git.ajattix.org/hashirama/ajattix/raw/branch/main/misc/contributors/crzjp.jpg" width="60px" alt="" /></a>  <a href="https://gitlab.vulnix.sh/spacecadet"><img src="https://git.ajattix.org/hashirama/ajattix/raw/branch/main/misc/contributors/spacecadet.jpg" width="60px" alt="" /></a> <!-- contributors -->

ajatt/packages/deep-learning.scm

@@ -0,0 +1,41 @@
+(define-module (ajatt packages deep-learning)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages version-control)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix gexp)
+  #:use-module (guix utils)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module ((guix licenses) #:prefix license:))
+
+
+
+
+(define-public ncnn
+  (package
+   (name "ncnn")
+   (version "20240820")
+   (source
+    (origin
+     (method git-fetch)
+     (uri
+      (git-reference
+       (url "https://github.com/Tencent/ncnn.git")
+       (commit "80c78a0e40d2c8843cdbb3917fd00387a0e33ce1")))
+     (sha256
+      (base32 "1ksqp7a7wbxsm8d7qpffxiifjrl3v10zqjy3b8mak00gcyjsfdv0"))))
+   (build-system cmake-build-system)
+   (arguments
+    (list  #:cmake cmake
+           #:tests? #f ))
+   (synopsis "ncnn is a high-performance neural network inference framework optimized for the mobile platform.")
+   (description
+    "ncnn is a high-performance neural network inference computing framework optimized for mobile platforms. ncnn is deeply considerate about deployment and uses on mobile phones from the beginning of design. ncnn does not have third-party dependencies. It is cross-platform and runs faster than all known open-source frameworks on mobile phone cpu.")
+   (home-page "https://github.com/Tencent/ncnn")
+   (license
+    (list license:bsd-2
+	  license:zlib))))
+
+ncnn

ajatt/packages/dictionaries.scm

@@ -11,7 +11,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
-  #:use-module ((gnu packages qt) #:hide (qtspeech))
+  #:use-module ((gnu packages qt))
   #:use-module (gnu packages search)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages version-control)
@@ -27,7 +27,6 @@
   #:use-module (guix utils)
   #:use-module (guix git-download)
   #:use-module (guix packages)
-  #:use-module (ajatt packages qt)
   #:use-module (ajatt packages suckless)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages search)
@@ -51,16 +50,16 @@
 (define-public goldendict-ng
   (package
    (name "goldendict-ng")
-   (version "24.05.14.1")
+   (version "24.11")
    (source
     (origin
      (method git-fetch)
      (uri
       (git-reference
        (url "https://github.com/xiaoyifang/goldendict-ng.git")
-       (commit "6486e7b57c3bd39b9ec63e2b34e2f5e8f17bf499")))
+       (commit "4a0124de3bb78ed0153eb9415b079a9c72a6bd32")))
      (sha256
-      (base32 "0li7zvxivgyffjm4gjlaw8syyqiaczn3778q1rl2ncp9l8008gxp"))))
+      (base32 "1mx3llhgfhcx6zflzp9x84z5c2ilf77dqp331f8zwrpd2hmzn9j7"))))
    (build-system cmake-build-system)
    (arguments
      (list #:tests? #f
@@ -74,7 +73,7 @@
                                   "/include/qt6/QtPrintSupport"))
            #:phases
            #~(modify-phases %standard-phases
-               (add-after 'wrap 'wrap-qt-process-path
+               (add-after 'install 'wrap-qt-process-path
                 (lambda* (#:key inputs outputs #:allow-other-keys)
                   (wrap-program (search-input-file outputs "bin/goldendict")
                     `("QTWEBENGINE_RESOURCES_PATH" =
@@ -87,6 +86,8 @@
     (list hunspell
           icu4c
           libeb
+	  qtwebengine
+	  qtsvg
           libtiff
           libvorbis
           libxkbcommon
@@ -111,12 +112,15 @@
     (list ao
           bzip2
           ffmpeg
+          qtsvg
           xapian
           qtmultimedia
-          qtwebengine
           gstreamer
           qtbase
+	  qtsvg
           xproto))
+   (propagated-inputs
+    (list qtsvg))
    (synopsis "A feature-rich dictionary lookup program")
    (description
     "GoldenDict is a feature-rich dictionary lookup program,
@@ -149,9 +153,11 @@ to type in words without any accents or correct case.")
           libx11
           font-google-noto-sans-cjk
           libxinerama
-          perl
           sdcv
           sselp))
+   (propagated-inputs
+    (list
+     perl))		       
    (arguments
     (list #:tests? #f
           #:make-flags
@@ -359,4 +365,30 @@ the popup and sdcv for the dictionary lookup.")
    (license
     (list license:expat))))
 
+
+(define-public mxml
+  (package
+   (name "mxml")
+   (version "4.0.3")
+   (source
+    (origin
+     (method git-fetch)
+     (uri
+      (git-reference
+       (url "https://github.com/michaelrsweet/mxml.git")
+       (commit "95445118c262d7e9a921c2773b59872fc2eccd16")))
+     (sha256
+      (base32 "0pi6awl67rh9679wac8bk3x1lkr4c75a790z68gp6b29j6406805"))))
+   (build-system gnu-build-system)
+   (arguments
+    (list 
+           #:tests? #f ))
+   (synopsis " Tiny XML library.")
+   (description
+    "Mini-XML is a small XML parsing library that you can use to read XML data files or strings in your application without requiring large non-standard libraries. Mini-XML only requires a make program and a C99 compatible compiler - GCC works, as do most vendors' C compilers.")
+   (home-page "https://www.msweet.org/mxml")
+   (license
+    (list license:asl2.0))))
+
+
 goldendict-ng

ajatt/packages/qt.scm

@@ -1,43 +0,0 @@
-(define-module (ajatt packages qt)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages qt)
-  #:use-module (guix build-system qt)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix search-paths)
-  #:use-module ((guix licenses) #:prefix license:))
-
-(define qt-url
-  (@@ (gnu packages qt) qt-url))
-
-(define-public qtspeech
-  (package
-    (inherit qtsvg)
-    (name "qtspeech")
-    (version "6.5.2")
-    (source (origin
-              (method url-fetch)
-              (uri (qt-url name version))
-              (sha256
-               (base32
-                "1cnlc9x0wswzl7j2imi4kvs9zavs4z1mhzzfpwr6d9zlfql9rzw8"))))
-   (arguments
-     (list
-      #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'set-display
-            (lambda _
-              ;; Make Qt render "offscreen", required for tests.
-              (setenv "QT_QPA_PLATFORM" "offscreen"))))))
-    (inputs (list qtbase))
-    (native-inputs (list perl qtdeclarative qtmultimedia 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
-who are visually challenged or cannot access the application for whatever
-reason.  The most common use case where text-to-speech comes in handy is when
-the end-user is driving and cannot attend the incoming messages on the phone.
-In such a scenario, the messaging application can read out the incoming
-message.")))

ajatt/packages/video.scm

@@ -151,9 +151,9 @@
   #:use-module ((guix licenses) #:prefix license:))
 
 
-(define-public vvdec
+(define-public vvdec-lib
   (package
-   (name "vvdec")
+   (name "vvdec-lib")
    (version "2.3.1")
    (source
     (origin
@@ -171,7 +171,7 @@
      #~(list "-DBUILD_SHARED_LIBS=1")
      #:cmake cmake
      #:tests? #f ))
-   (synopsis "VVdeC, the Fraunhofer Versatile Video Decoder.")
+   (synopsis "(Library) VVdeC, the Fraunhofer Versatile Video Decoder.")
    (description
     "VVdeC, the Fraunhofer Versatile Video Decoder, is a fast software H.266/VVC decoder implementation supporting all features of the VVC Main10 profile.")
    (home-page "https://www.hhi.fraunhofer.de/en/departments/vca/technologies-and-solutions/h266-vvc.html")
@@ -180,6 +180,37 @@
 
 
 
+(define-public vvdec-app
+  (package
+   (name "vvdec-app")
+   (version "2.3.1")
+   (source
+    (origin
+     (method git-fetch)
+     (uri
+      (git-reference
+       (url "https://github.com/fraunhoferhhi/vvdec.git")
+       (commit "a1996a8c12593c5ce116243bed7a65dd59489a8d")))
+     (sha256
+      (base32 "0ka74689s0hmw68gnm6vi8fah43ppabmbc9fjbv7bfjd728vnnv0"))))
+   (build-system cmake-build-system)
+   (arguments
+    (list
+     #:configure-flags
+     #~(list "-DCMAKE_BUILD_TYPE=Release"
+	     "-DVVENC_INSTALL_FULLFEATURE_APP=ON")
+     #:cmake cmake
+     #:tests? #f ))
+   (synopsis "(Standalone Encoder) VVdeC, the Fraunhofer Versatile Video Decoder.")
+   (description
+    "VVdeC, the Fraunhofer Versatile Video Decoder, is a fast software H.266/VVC decoder implementation supporting all features of the VVC Main10 profile.")
+   (home-page "https://www.hhi.fraunhofer.de/en/departments/vca/technologies-and-solutions/h266-vvc.html")
+   (license
+    (list license:bsd-3))))
+
+
+
+
 
 (define-public ffmpeg-vvdec
   (package
@@ -205,7 +236,7 @@
            freetype
            frei0r-plugins
            gnutls
-	   vvdec
+	   vvdec-lib
            opus
            ladspa
            lame
@@ -391,5 +422,71 @@ audio/video codec library.")
    (license license:gpl2+)))
 
 
+(define-public uvg266 
+  (package
+   (name "uvg266")
+   (version "0.8.1")
+   (source
+    (origin
+     (method git-fetch)
+     (uri
+      (git-reference
+       (url "https://github.com/ultravideo/uvg266.git")
+       (commit "6999e4484143091067b0d631b624aea7554a46db")
+       (recursive? #t)))
+     (sha256
+      (base32 "0pc8r5dj6zrbiacx759acgxlfh05hxywz09i2zzcqg832d9srmfr"))))
+   (build-system cmake-build-system)
+   (arguments
+    (list  #:cmake cmake                 	   
+           #:tests? #f ))
+   (synopsis "An open-source VVC encoder based on Kvazaar.")
+   (description
+    "An open-source VVC encoder licensed under 3-clause BSD.")
+   (home-page "https://ultravideo.fi/uvg266.html")
+   (license
+    (list license:bsd-3))))
 
-ffmpeg-vvdec
+
+(define-public gpac 
+  (package
+   (name "gpac")
+   (version "2.4")
+   (source
+    (origin
+     (method git-fetch)
+     (uri
+      (git-reference
+       (url "https://github.com/gpac/gpac.git")
+       (commit "ccc6a76a67e08814e20ca678b84899653102b1f5")))
+     (sha256
+      (base32 "03lzg7q0kc4wdwfrh7kbrlml4kmx8nsp3zh6dsmby7q53wdwa7c6"))))
+   (build-system gnu-build-system)
+   (inputs (append (list zlib pkg-config)))
+   (arguments
+    (list  #:tests? #f
+	   #:configure-flags #~(list "--static-bin" )
+	   #:phases
+	   #~(modify-phases %standard-phases
+			  ;; this is very weird, but absolutely needed.
+			  (replace 'install
+				   (lambda* (#:key outputs #:allow-other-keys)
+					    (invoke "make" "install")
+					      )))))
+   (native-inputs
+    (list  (list zlib "static")
+	   (list zstd "lib")
+	   pkg-config
+	   cmake
+           yasm
+	   ))
+   (synopsis "GPAC Ultramedia OSS for Video Streaming & Next-Gen Multimedia Transcoding, Packaging & Delivery.")
+   (description
+    "GPAC is an open-source multimedia framework focused on modularity and standards compliance. GPAC provides tools to process, inspect, package, stream, playback and interact with media content. Such content can be any combination of audio, video, subtitles, metadata, scalable graphics, encrypted media, 2D/3D graphics and ECMAScript. GPAC is best-known for its wide MP4/ISOBMFF capabilities and is popular among video enthusiasts, academic researchers, standardization bodies, and professional broadcasters.")
+   (home-page "https://gpac.io/")
+   (license
+    (list license:lgpl2.1))))
+
+
+
+vvdec-app