]> granicus.if.org Git - handbrake/commitdiff
flatpak: remove unnecessary dependencies
authorJohn Stebbins <jstebbins.hb@gmail.com>
Sun, 6 Jan 2019 20:41:23 +0000 (13:41 -0700)
committerJohn Stebbins <jstebbins.hb@gmail.com>
Sun, 6 Jan 2019 21:05:49 +0000 (14:05 -0700)
make/include/main.defs
pkg/linux/flatpak/fr.handbrake.HandBrakeCLI.json
pkg/linux/flatpak/fr.handbrake.ghb.json

index d56b752d4d561eef8fd67f9d7279c7af49c03757..eaf2d72d6e51afd1fd16c12e45f427a4b21fdfa6 100644 (file)
@@ -28,11 +28,10 @@ ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
     MODULES += contrib/lame
     MODULES += contrib/x264
     MODULES += contrib/jansson
+    MODULES += contrib/libvpx
 endif
 
 ifeq (1,$(FEATURE.flatpak))
-    MODULES += contrib/libopus
-    MODULES += contrib/lame
     MODULES += contrib/jansson
     MODULES += contrib/x264
 endif
@@ -49,7 +48,6 @@ ifeq (1,$(FEATURE.x265))
 endif
 
 MODULES += contrib/ffmpeg
-MODULES += contrib/libvpx
 MODULES += contrib/libdvdread
 MODULES += contrib/libdvdnav
 MODULES += contrib/libbluray
index 0e878b1b70e9a1700b3911aba59dabff316fbf93..6513965dd65bf229bac4abb95e943df374d0761f 100644 (file)
                 }
             ],
             "modules": [
-                {
-                    "name": "nasm",
-                    "cleanup": ["*"],
-                    "sources": [
-                        {
-                            "type": "archive",
-                            "url": "https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.xz",
-                            "sha256": "e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5"
-                        }
-                    ]
-                }
             ]
         }
     ]
index 6e448e0bc5e10320c5dcc06e6412397412a7267a..8cb5e1453f9d5893320b8c71000304180d0e05ff 100644 (file)
                 }
             ],
             "modules": [
-                {
-                    "name": "nasm",
-                    "cleanup": ["*"],
-                    "sources": [
-                        {
-                            "type": "archive",
-                            "url": "https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.xz",
-                            "sha256": "e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5"
-                        }
-                    ]
-                }
             ]
         }
     ]