From 865fa6b6b95903d10ac577b02aa689fd92d360cc Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 22 Jun 2024 14:55:56 +0200 Subject: [PATCH] Makefile.defs: fixes following ffmpeg 7 and rpm user and group deps management --- Makefile.defs | 65 +++++++++++++++------------------------------------ 1 file changed, 19 insertions(+), 46 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 5031548..418fc3f 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1,5 +1,20 @@ # def file for openmamba platforms +group[adm] = setup +group[audio] = setup +group[dialout] = setup +group[disk] = setup +group[filesharing] = setup +group[kmem] = setup +group[kvm] = systemd +group[lp] = setup +group[root] = setup +group[tape] = setup +group[tty] = setup +group[users] = setup +group[utmp] = setup +user[root] = setup + /bin/sh = bash /usr/bin/clear = ncurses @@ -305,28 +320,8 @@ libwayland-egl.so.1[][64bit] = libwayland-egl libAppStreamQt.so.2[][64bit] = libappstream-qt libappstream.so.4[][64bit] = libappstream # ffmpeg / libav -libavresample.so.3[][64bit] = libavresample-ffmpeg -libavresample.so.3[LIBAVRESAMPLE_3][64bit] = libavresample-ffmpeg -libavutil.so.52[][64bit] = libavutil-ffmpeg2 -libavutil.so.52[LIBAVUTIL_52][64bit] = libavutil-ffmpeg2 -libavutil.so.55[][64bit] = libavutil-ffmpeg -libavutil.so.55[LIBAVUTIL_55][64bit] = libavutil-ffmpeg -libavcodec.so.57[][64bit] = libavcodec-ffmpeg -libavcodec.so.57[LIBAVCODEC_57][64bit] = libavcodec-ffmpeg -libavfilter.so.6[][64bit] = libavfilter-ffmpeg -libavfilter.so.6[LIBAVFILTER_6][64bit] = libavfilter-ffmpeg -libavformat.so.57[][64bit] = libavformat-ffmpeg -libavformat.so.57[LIBAVFORMAT_57][64bit] = libavformat-ffmpeg -libswscale.so.2[][64bit] = libswscale-ffmpeg2 -libswscale.so.2[LIBSWSCALE_2][64bit] = libswscale-ffmpeg2 -libpostproc.so.52[][64bit] = libpostproc-ffmpeg2 -libpostproc.so.52[LIBPOSTPROC_52][64bit] = libpostproc-ffmpeg2 -libswresample.so.0[][64bit] = libswresample-ffmpeg2 -libswresample.so.0[LIBSWRESAMPLE_0][64bit] = libswresample-ffmpeg2 -libswresample.so.4[][64bit] = libswresample-ffmpeg -libswresample.so.4[LIBSWRESAMPLE_4][64bit] = libswresample-ffmpeg -libswscale.so.4[][64bit] = libswscale-ffmpeg -libswscale.so.4[LIBSWSCALE_4][64bit] = libswscale-ffmpeg +libswresample.so.4[][64bit] = libswresample-ffmpeg6 +libswresample.so.4[LIBSWRESAMPLE_4][64bit] = libswresample-ffmpeg6 libpoppler-qt4.so.4[][64bit] = libpoppler-qt4 libpoppler-cpp.so.0[][64bit] = libpoppler-cpp libpoppler-glib.so.8[][64bit] = libpoppler-glib @@ -384,30 +379,8 @@ libwayland-egl.so.1 = libwayland-egl libAppStreamQt.so.2 = libappstream-qt libappstream.so.4 = libappstream # ffmpeg / libav -libavresample.so.3 = libavresample-ffmpeg -libavresample.so.3[LIBAVRESAMPLE_3] = libavresample-ffmpeg -libavutil.so.52 = libavutil-ffmpeg2 -libavutil.so.52[LIBAVUTIL_52] = libavutil-ffmpeg2 -libavutil.so.55 = libavutil-ffmpeg -libavutil.so.55[LIBAVUTIL_55] = libavutil-ffmpeg -libavutil.so.55 = libavutil-ffmpeg -libavutil.so.55[LIBAVUTIL_52] = libavutil-ffmpeg -libavcodec.so.57 = libavcodec-ffmpeg -libavcodec.so.57[LIBAVCODEC_57] = libavcodec-ffmpeg -libavfilter.so.6 = libavfilter-ffmpeg -libavfilter.so.6[LIBAVFILTER_6] = libavfilter-ffmpeg -libavformat.so.57 = libavformat-ffmpeg -libavformat.so.57[LIBAVFORMAT_57] = libavformat-ffmpeg -libswscale.so.2 = libswscale-ffmpeg2 -libswscale.so.2[LIBSWSCALE_2] = libswscale-ffmpeg2 -libpostproc.so.52 = libpostproc-ffmpeg2 -libpostproc.so.52[LIBPOSTPROC_52] = libpostproc-ffmpeg2 -libswresample.so.0 = libswresample-ffmpeg2 -libswresample.so.0[LIBSWRESAMPLE_0] = libswresample-ffmpeg2 -libswresample.so.4 = libswresample-ffmpeg -libswresample.so.4[LIBSWRESAMPLE_4] = libswresample-ffmpeg -libswscale.so.4 = libswscale-ffmpeg -libswscale.so.4[LIBSWSCALE_4] = libswscale-ffmpeg +libswresample.so.4 = libswresample-ffmpeg6 +libswresample.so.4[LIBSWRESAMPLE_4] = libswresample-ffmpeg6 libpoppler-qt4.so.4 = libpoppler-qt4 libpoppler-cpp.so.0 = libpoppler-cpp libpoppler-glib.so.8 = libpoppler-glib