contrib: gtk: libhb: make: scripts: Remove yasm contrib.

diff --git a/contrib/yasm/module.defs b/contrib/yasm/module.defs
deleted file mode 100644 (file)
index 61c1c9b..0000000
--- a/contrib/yasm/module.defs
+++ /dev/null
@@ -1,6 +0,0 @@
-$(eval $(call import.MODULE.defs,YASM,yasm))
-$(eval $(call import.CONTRIB.defs,YASM))
-
-YASM.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/yasm-1.3.0.tar.gz
-YASM.FETCH.url    += https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz
-YASM.FETCH.sha256  = 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f

diff --git a/contrib/yasm/module.rules b/contrib/yasm/module.rules
deleted file mode 100644 (file)
index ade13f9..0000000
--- a/contrib/yasm/module.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-$(eval $(call import.MODULE.rules,YASM))
-$(eval $(call import.CONTRIB.rules,YASM))

diff --git a/gtk/ghb.spec b/gtk/ghb.spec
index 06faafec238a5b634878a99ce58bdff6442dbb08..501d0413c7beafa44c93d1180df573e089fe08e8 100644 (file)
--- a/gtk/ghb.spec
+++ b/gtk/ghb.spec
@@ -12,7 +12,7 @@ Prefix:               %{_prefix}
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: glib2-devel, gtk3-devel, webkitgtk3-devel
 BuildRequires: gstreamer1-devel, gstreamer1-plugins-base-devel, libgudev1-devel
-BuildRequires: bzip2-devel, intltool, libnotify-devel, libtool, yasm
+BuildRequires: bzip2-devel, intltool, libnotify-devel, libtool
 Requires:      gtk3, coreutils
 
 %define debug_package %{nil}

diff --git a/libhb/module.defs b/libhb/module.defs
index 6afb6f403aee8806c973705a18fc506ffc81d5ea..bc760b3084558aec6918d7126572a67b197bf6a9 100644 (file)
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -105,29 +105,6 @@ endif
 
 ###############################################################################
 
-## when defined this gives us the subdir name, or flavor of asm implementation
-ifneq (disabled,$(FEATURE.asm))
-
-LIBHB.yasm.src/   = $(LIBHB.src/)$(FEATURE.asm)/
-LIBHB.yasm.build/ = $(LIBHB.build/)$(FEATURE.asm)/
-LIBHB.yasm.asm    = $(LIBHB.yasm.src/)deinterlace-a.asm
-LIBHB.yasm.o      = $(LIBHB.yasm.asm:$(LIBHB.yasm.src/)%.asm=$(LIBHB.yasm.build/)%.o)
-LIBHB.yasm.d      = $(wildcard $(LIBHB.yasmsrc/)*.h)
-
-LIBHB.YASM.I     = $(LIBHB.yasm.src/)
-LIBHB.YASM.ASM_O = $(strip $(YASM.exe) \
-    -f $(LIBHB.YASM.f) \
-    -m $(LIBHB.YASM.m) \
-    $(LIBHB.YASM.D:%=-D%) \
-    $(LIBHB.YASM.I:%=-I%) \
-    -o $(1) $(2))
-
-LIBHB.out += $(LIBHB.yasm.o)
-
-endif
-
-###############################################################################
-
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
 
 LIBHB.dll = $(LIBHB.build/)hb.dll

diff --git a/libhb/module.rules b/libhb/module.rules
index 80828577c0d7f600607ea1fc39283d9807fd0bc1..91dc7833f6dc18cd1ef0d5709f76b8889b912c3f 100644 (file)
--- a/libhb/module.rules
+++ b/libhb/module.rules
@@ -3,7 +3,7 @@ $(eval $(call import.MODULE.rules,LIBHB))
 libhb.build: $(LIBHB.a)
 
 $(LIBHB.a): | $(dir $(LIBHB.a))
-$(LIBHB.a): $(LIBHB.c.o) $(LIBHB.m.o) $(LIBHB.yasm.o)
+$(LIBHB.a): $(LIBHB.c.o) $(LIBHB.m.o)
        $(AR.exe) rsu $@ $^
 
 $(LIBHB.c.o): $(LIBHB.d)
@@ -28,23 +28,12 @@ libhb.clean:
 
 ###############################################################################
 
-ifneq (disabled,$(FEATURE.asm))
-
-$(LIBHB.yasm.o): $(LIBHB.yasm.d)
-$(LIBHB.yasm.o): | $(dir $(LIBHB.yasm.o))
-$(LIBHB.yasm.o): $(LIBHB.yasm.build/)%.o: $(LIBHB.yasm.src/)%.asm
-       $(call LIBHB.YASM.ASM_O,$@,$<)
-
-endif
-
-###############################################################################
-
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
 
 libhb.build: $(LIBHB.dll)
 
 $(LIBHB.dll): | $(dirname $(LIBHB.dll) $(LIBHB.lib))
-$(LIBHB.dll): $(LIBHB.c.o) $(LIBHB.yasm.o)
+$(LIBHB.dll): $(LIBHB.c.o)
        $(call LIBHB.GCC.DYLIB++,$@,$^ $(LIBHB.dll.libs))
 ifeq (none,$(FFMPEG.GCC.g))
        $(STRIP.exe) -s $(LIBHB.dll)

diff --git a/make/configure.py b/make/configure.py
index b2fa916bed2fa1d388e9c2219d72072c2f07ef99..2c92e10283c26c7b73c92295b0b9570ee6335af8 100644 (file)
--- a/make/configure.py
+++ b/make/configure.py
@@ -1344,8 +1344,6 @@ def createCLI():
     grp.add_option( '--minver', default=None, action='store', metavar='VER',
         help=h )
 
-    h = IfHost( 'Build and use local yasm', '*-*-*', none=optparse.SUPPRESS_HELP ).value
-    grp.add_option( '--enable-local-yasm', default=False, action='store_true', help=h )
     h = IfHost( 'Build and use local autotools', '*-*-*', none=optparse.SUPPRESS_HELP ).value
     grp.add_option( '--enable-local-autotools', default=False, action='store_true', help=h )
     h = IfHost( 'Build and use local cmake', '*-*-*', none=optparse.SUPPRESS_HELP ).value
@@ -1532,7 +1530,6 @@ try:
         strip    = ToolProbe( 'STRIP.exe',    'strip' )
         tar      = ToolProbe( 'TAR.exe',      'gtar', 'tar' )
         nasm     = ToolProbe( 'NASM.exe',     'nasm', abort=False, minversion=[2,13,0] )
-        yasm     = ToolProbe( 'YASM.exe',     'yasm', abort=False, minversion=[1,2,0] )
         autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', abort=False )
         automake = ToolProbe( 'AUTOMAKE.exe', 'automake', abort=False )
         cmake    = ToolProbe( 'CMAKE.exe',    'cmake', abort=False )
@@ -1599,16 +1596,6 @@ try:
         elif Tools.nasm.version.inadequate():
             raise AbortError( 'error: minimum required nasm version is %s and %s is %s\n' % ('.'.join([str(i) for i in Tools.nasm.version.minversion]),Tools.nasm.pathname,Tools.nasm.version.svers) )
 
-    ## enable local yasm when yasm probe fails or version is too old
-    ## x264 requires 1.2.0+
-    if not options.enable_local_yasm:
-        if Tools.yasm.fail:
-            stdout.write( 'note: enabling local yasm: missing system yasm\n' )
-            options.enable_local_yasm = True
-        elif Tools.yasm.version.inadequate():
-            stdout.write( 'note: enabling local yasm: minimum required version is %s and %s is %s\n' % ('.'.join([str(i) for i in Tools.yasm.version.minversion]),Tools.yasm.pathname,Tools.yasm.version.svers) )
-            options.enable_local_yasm = True
-
     ## enable local autotools when any of { autoconf, automake, libtool } probe fails
     if not options.enable_local_autotools and (Tools.autoconf.fail or Tools.automake.fail or Tools.libtool.fail):
         stdout.write( 'note: enabling local autotools\n' )
@@ -1868,7 +1855,6 @@ int main()
     doc.add( 'PREFIX/', cfg.prefix_final + os.sep )
 
     doc.addBlank()
-    doc.add( 'FEATURE.local_yasm', int( options.enable_local_yasm ))
     doc.add( 'FEATURE.local_autotools', int( options.enable_local_autotools ))
     doc.add( 'FEATURE.local_cmake', int( options.enable_local_cmake ))
     doc.add( 'FEATURE.local_pkgconfig', int( options.enable_local_pkgconfig ))
@@ -1957,27 +1943,14 @@ int main()
     elif build.match( 'amd64-*' ):
         doc.add( 'LIBHB.GCC.D', 'ARCH_X86_64', append=True )
 
-    if options.enable_asm and ( not Tools.yasm.fail or options.enable_local_yasm ):
+    if options.enable_asm and ( not Tools.nasm.fail ):
         asm = ''
         if build.match( 'i?86-*' ):
             asm = 'x86'
             doc.add( 'LIBHB.GCC.D', 'HAVE_MMX', append=True )
-            doc.add( 'LIBHB.YASM.D', 'ARCH_X86', append=True )
-            if build.match( '*-*-darwin*' ):
-                doc.add( 'LIBHB.YASM.f', 'macho32' )
-            else:
-                doc.add( 'LIBHB.YASM.f', 'elf32' )
-            doc.add( 'LIBHB.YASM.m', 'x86' )
         elif build.match( 'x86_64-*' ) or build.match( 'amd64-*' ):
             asm = 'x86'
             doc.add( 'LIBHB.GCC.D', 'HAVE_MMX ARCH_X86_64', append=True )
-            if build.match( '*-*-darwin*' ):
-                doc.add( 'LIBHB.YASM.D', 'ARCH_X86_64 PIC', append=True )
-                doc.add( 'LIBHB.YASM.f', 'macho64' )
-            else:
-                doc.add( 'LIBHB.YASM.D', 'ARCH_X86_64', append=True )
-                doc.add( 'LIBHB.YASM.f', 'elf64' )
-            doc.add( 'LIBHB.YASM.m', 'amd64' )
         doc.update( 'FEATURE.asm', asm )
 
     ## add exports to make

diff --git a/make/include/main.defs b/make/include/main.defs
index 2cfa446dd369053fe94d41d55fe8bf558fb4235d..7db389b5286af33d75dd8db706ac4be05fd811f9 100644 (file)
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -67,7 +67,6 @@ ifeq (1,$(FEATURE.flatpak))
     MODULES += contrib/fribidi
     MODULES += contrib/freetype
     MODULES += contrib/libass
-    MODULES += contrib/yasm
 endif
 
 ifeq (1,$(FEATURE.fdk_aac))
@@ -164,10 +163,6 @@ ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.system))
     MODULES += gtk
 endif
 
-ifeq (1,$(FEATURE.local_yasm))
-    MODULES += contrib/yasm
-endif
-
 ###############################################################################
 
 MODULES += pkg

diff --git a/scripts/mac-toolchain-build b/scripts/mac-toolchain-build
index c1f4ec99596f7a3ce85d4e87aea2343bd1b188a5..56120629c8d1ea82c1be74128113c49fa4f4c20c 100755 (executable)
--- a/scripts/mac-toolchain-build
+++ b/scripts/mac-toolchain-build
@@ -34,7 +34,7 @@ function mac_toolchain_build {
         MAKEJOBS="4"
     fi
     SUDO=
-    TOTAL=7
+    TOTAL=6
 
     # functions
     function print_fail_and_exit {
@@ -89,9 +89,6 @@ function mac_toolchain_build {
     printf "Downloading [%02i/%02i] %s " "6" "${TOTAL}" "nasm 2.13.02"
     curl -Lf --connect-timeout 30 https://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.bz2 -o "nasm-2.13.02.tar.bz2" >/dev/null 2>&1 || print_fail_and_exit
     echo -en "${CREL}"
-    printf "Downloading [%02i/%02i] %s " "7" "${TOTAL}" "yasm 1.3.0"
-    curl -Lf --connect-timeout 30 https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -o "yasm-1.3.0.tar.gz" >/dev/null 2>&1 || print_fail_and_exit
-    echo -en "${CREL}"
     printf "Downloading [%02i/%02i] complete.\n" "${TOTAL}" "${TOTAL}"
 
     # autoconf
@@ -160,17 +157,6 @@ function mac_toolchain_build {
     ${SUDO} make install >>../nasm-2.13.02.log 2>&1 || print_fail_and_exit
     echo -en "${CREL}"
 
-    # yasm
-    cd "${TEMP_DIR}"
-    printf "Building    [%02i/%02i] %s " "7" "${TOTAL}" "yasm 1.3.0"
-    [[ "${SUDO}" != "" ]] && ${SUDO} -v
-    tar -xf yasm-1.3.0.tar.gz >/dev/null 2>&1 || print_fail_and_exit
-    cd yasm-1.3.0 >/dev/null 2>&1 || print_fail_and_exit
-    ./configure --prefix="${PREFIX}" >../yasm-1.3.0.log 2>&1 || print_fail_and_exit
-    make --jobs="${MAKEJOBS}" >>../yasm-1.3.0.log 2>&1 || print_fail_and_exit
-    ${SUDO} make install >>../yasm-1.3.0.log 2>&1 || print_fail_and_exit
-    echo -en "${CREL}"
-
     # done
     printf "Building    [%02i/%02i] complete.\n" "${TOTAL}" "${TOTAL}"
     rm -rf "${TEMP_DIR}"