X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fblds%2Fbld_prepare.sh;h=61e0950068cca20b950624f52daec53ca37df4dc;hb=3b4b6f588c4f2643316afcbc486ca6a35c16a431;hp=801a71b83b2112e9cb56fb0c94da6e8332f99d34;hpb=b290324e67a45e465f2d0ad5d0ee662b64343339;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/blds/bld_prepare.sh b/cinelerra-5.1/blds/bld_prepare.sh
index 801a71b8..61e09500 100755
--- a/cinelerra-5.1/blds/bld_prepare.sh
+++ b/cinelerra-5.1/blds/bld_prepare.sh
@@ -27,7 +27,7 @@ case "$dir" in
     libsndfile-devel libtheora-devel linux-firmware ivtv-firmware \
     libvorbis-devel texinfo xz-devel lzma-devel cmake udftools git \
     autoconf automake rpm-build jbigkit-devel libvdpau-devel libva-devel \
-    alsa-lib-devel gtk2-devel meson
+    alsa-lib-devel gtk2-devel
     yasm=yasm-1.3.0-3.fc24.x86_64.rpm
     release=http://archives.fedoraproject.org/pub/fedora/linux/releases/24
     url=$release/Everything/x86_64/os/Packages/y/$yasm
@@ -35,11 +35,11 @@ case "$dir" in
     yum -y install /tmp/$yasm
     rm -f /tmp/$yasm
   ;;
-#"fedora30")
+#"fedora3*")
 #  dnf group install "Development Tools"
-#  ... lzma-sdk-devel libtool ...
+#  ... rpm-build lzma-sdk-devel libtool ...
 "fedora")
-  dnf install groups "Development Tools"
+  dnf group install "Development Tools"
   dnf -y --best --allowerasing \
     install nasm yasm libavc1394-devel libusbx-devel flac-devel \
     libjpeg-devel libdv-devel libdvdnav-devel libdvdread-devel \
@@ -51,11 +51,10 @@ case "$dir" in
     libpng-devel bzip2-devel zlib-devel kernel-headers libavc1394 \
     festival-devel libdc1394-devel libiec61883-devel esound-devel \
     flac-devel libsndfile-devel libtheora-devel linux-firmware \
-    ivtv-firmware libvorbis-devel texinfo xz-devel lzma-devel cmake git \
+    ivtv-firmware libvorbis-devel texinfo xz-devel cmake git \
     ctags patch gcc-c++ perl-XML-XPath libtiff-devel python dvdauthor \
     gettext-devel inkscape udftools autoconf automake numactl-devel \
-    jbigkit-devel libvdpau-devel libva-devel gtk2-devel mesa-vdpau-drivers \
-    meson
+    jbigkit-devel libvdpau-devel libva-devel gtk2-devel mesa-vdpau-drivers
   ;;
 "suse" | "leap")
   zypper -n install nasm gcc gcc-c++ zlib-devel texinfo libpng16-devel \
@@ -67,7 +66,7 @@ case "$dir" in
     ilmbase-devel fftw3-devel libsndfile-devel libtheora-devel flac-devel \
     libtiff-devel inkscape cmake patch libnuma-devel lzma-devel udftools git \
     yasm autoconf automake rpm-build libjbig-devel libvdpau-devel libva-devel \
-    gtk2-devel libusb-1_0-devel meson
+    gtk2-devel libusb-1_0-devel
     if [ ! -f /usr/lib64/libtermcap.so ]; then
       ln -s libtermcap.so.2 /usr/lib64/libtermcap.so
     fi
@@ -81,7 +80,7 @@ case "$dir" in
     fonts-dejavu libopenexr-dev festival libfftw3-dev gdb libusb-1.0-0-dev \
     libdc1394-22-dev libflac-dev libjbig-dev libvdpau-dev libva-dev \
     inkscape libsndfile1-dev libtheora-dev cmake udftools libxml2-utils git \
-    autoconf automake debhelper libgtk2.0-dev meson
+    autoconf automake debhelper libgtk2.0-dev
   ;;
 #"ub16-10")
 #  apt-get -y install libx264-dev libx265-dev libvpx-dev libmjpegtools-dev
@@ -93,8 +92,7 @@ case "$dir" in
     fonts-dejavu libopenexr-dev libavc1394-dev festival-dev fftw3-dev gdb \
     libdc1394-22-dev libiec61883-dev libflac-dev libjbig-dev libusb-1.0-0-dev \
     libvdpau-dev libva-dev libsndfile1-dev libtheora-dev cmake udftools \
-    libxml2-utils git inkscape autoconf automake debhelper libgtk2.0-dev \
-    meson
+    libxml2-utils git inkscape autoconf automake debhelper libgtk2.0-dev
   ;;
  *)
   echo "unknown os: $dir"