From 10d159e0b63736f274c2d8a33958b700ccbaf8e4 Mon Sep 17 00:00:00 2001 From: neher-igel Date: Tue, 23 Apr 2024 17:19:29 -0600 Subject: [PATCH] Updated for OS1109+ --- CP_Source/Apps/VLC/build/build-vlc-cp.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/CP_Source/Apps/VLC/build/build-vlc-cp.sh b/CP_Source/Apps/VLC/build/build-vlc-cp.sh index 89d23df5..6e5ad2d6 100755 --- a/CP_Source/Apps/VLC/build/build-vlc-cp.sh +++ b/CP_Source/Apps/VLC/build/build-vlc-cp.sh @@ -9,13 +9,15 @@ ZIP_LOC="https://github.com/IGEL-Community/IGEL-Custom-Partitions/raw/master/CP_ ZIP_FILE="VLC" FIX_MIME="TRUE" CLEAN="TRUE" -OS11_CLEAN="11.07.100" -OS12_CLEAN="12.01.100" +OS11_CLEAN1108="11.08.440" +OS11_CLEAN1109="11.09.310" +OS12_CLEAN="12.3.2" USERHOME_FOLDERS="TRUE" USERHOME_FOLDERS_DIRS="custom/${CP}/userhome/.config/${CP} custom/${CP}/userhome/.local/share/${CP}" APPARMOR="TRUE" GETVERSION_FILE="../../${CP}_*amd64.deb" -MISSING_LIBS_OS11="i965-va-driver liba52-0.7.4 libaacs0 libaribb24-0 libass9 libavcodec57 libavformat57 libavutil55 libbasicusageenvironment1 libbdplus0 libbluray2 libcddb2 libchromaprint1 libcrystalhd3 libdc1394-22 libdca0 libdouble-conversion1 libdvbpsi10 libdvdnav4 libdvdread4 libebml4v5 libfaad2 libgme0 libgroupsock8 libgsm1 libkate1 liblirc-client0 liblivemedia62 liblua5.2-0 libmad0 libmatroska6v5 libmicrodns0 libmpcdec6 libmpeg2-4 libnfs11 libopenjp2-7 libopenmpt-modplug1 libopenmpt0 libplacebo4 libpostproc54 libprotobuf-lite10 libproxy-tools libqt5core5a libqt5dbus5 libqt5gui5 libqt5network5 libqt5svg5 libqt5widgets5 libqt5x11extras5 libresid-builder0c2a libsdl-image1.2 libsdl1.2debian libshine3 libsidplay2 libsnappy1v5 libsndio6.1 libsoxr0 libssh-gcrypt-4 libssh2-1 libswresample2 libswscale4 libupnp6 libusageenvironment3 libva-drm2 libva-wayland2 libva-x11-2 libva2 libvdpau1 libvlc-bin libvlc5 libvlccore9 libvulkan1 libx264-152 libx265-146 libxcb-xinerama0 libxvidcore4 libzvbi-common libzvbi0 mesa-va-drivers mesa-vdpau-drivers qt5-gtk-platformtheme qttranslations5-l10n va-driver-all vdpau-driver-all vlc vlc-bin vlc-data vlc-l10n vlc-plugin-base vlc-plugin-notify vlc-plugin-qt vlc-plugin-samba vlc-plugin-skins2 vlc-plugin-video-output vlc-plugin-video-splitter vlc-plugin-visualization" +MISSING_LIBS_OS1108="i965-va-driver liba52-0.7.4 libaacs0 libaribb24-0 libass9 libavcodec57 libavformat57 libavutil55 libbasicusageenvironment1 libbdplus0 libbluray2 libcddb2 libchromaprint1 libcrystalhd3 libdc1394-22 libdca0 libdouble-conversion1 libdvbpsi10 libdvdnav4 libdvdread4 libebml4v5 libfaad2 libgme0 libgroupsock8 libgsm1 libkate1 liblirc-client0 liblivemedia62 liblua5.2-0 libmad0 libmatroska6v5 libmicrodns0 libmpcdec6 libmpeg2-4 libnfs11 libopenjp2-7 libopenmpt-modplug1 libopenmpt0 libplacebo4 libpostproc54 libprotobuf-lite10 libproxy-tools libqt5core5a libqt5dbus5 libqt5gui5 libqt5network5 libqt5svg5 libqt5widgets5 libqt5x11extras5 libresid-builder0c2a libsdl-image1.2 libsdl1.2debian libshine3 libsidplay2 libsnappy1v5 libsndio6.1 libsoxr0 libssh-gcrypt-4 libssh2-1 libswresample2 libswscale4 libupnp6 libusageenvironment3 libva-drm2 libva-wayland2 libva-x11-2 libva2 libvdpau1 libvlc-bin libvlc5 libvlccore9 libvulkan1 libx264-152 libx265-146 libxcb-xinerama0 libxvidcore4 libzvbi-common libzvbi0 mesa-va-drivers mesa-vdpau-drivers qt5-gtk-platformtheme qttranslations5-l10n va-driver-all vdpau-driver-all vlc vlc-bin vlc-data vlc-l10n vlc-plugin-base vlc-plugin-notify vlc-plugin-qt vlc-plugin-samba vlc-plugin-skins2 vlc-plugin-video-output vlc-plugin-video-splitter vlc-plugin-visualization" +MISSING_LIBS_OS1109="i965-va-driver intel-media-va-driver liba52-0.7.4 libaacs0 libaom3 libaribb24-0 libass9 libavcodec58 libavformat58 libavutil56 libbdplus0 libbluray2 libcddb2 libchromaprint1 libcodec2-1.0 libdav1d5 libdc1394-25 libdca0 libdouble-conversion3 libdvbpsi10 libdvdnav4 libdvdread8 libebml5 libfaad2 libgme0 libgsm1 libigdgmm12 libixml10 libkate1 liblirc-client0 liblua5.2-0 libmad0 libmatroska7 libmd4c0 libmfx1 libmpcdec6 libmpeg2-4 libmysofa1 libnorm1 libopenmpt-modplug1 libopenmpt0 libpcre2-16-0 libpgm-5.3-0 libplacebo192 libpostproc55 libprotobuf-lite23 libproxy-tools libqt5core5a libqt5dbus5 libqt5gui5 libqt5network5 libqt5svg5 libqt5widgets5 libqt5x11extras5 librabbitmq4 libresid-builder0c2a libsdl-image1.2 libsdl1.2debian libshine3 libsidplay2 libsnappy1v5 libsndio7.0 libspatialaudio0 libsrt1.4-gnutls libssh-gcrypt-4 libssh2-1 libswresample3 libswscale5 libudfread0 libupnp13 libva-drm2 libva-wayland2 libva-x11-2 libva2 libvdpau1 libvlc-bin libvlc5 libvlccore9 libvncclient1 libx264-163 libx265-199 libxcb-composite0 libxcb-xinerama0 libxcb-xinput0 libxvidcore4 libzmq5 libzvbi-common libzvbi0 mesa-va-drivers mesa-vdpau-drivers ocl-icd-libopencl1 qt5-gtk-platformtheme qttranslations5-l10n va-driver-all vdpau-driver-all vlc vlc-bin vlc-data vlc-l10n vlc-plugin-access-extra vlc-plugin-base vlc-plugin-notify vlc-plugin-qt vlc-plugin-samba vlc-plugin-skins2 vlc-plugin-video-output vlc-plugin-video-splitter vlc-plugin-visualization" MISSING_LIBS_OS12="i965-va-driver intel-media-va-driver liba52-0.7.4 libaacs0 libaom0 libaribb24-0 libass9 libavcodec58 libavformat58 libavutil56 libbasicusageenvironment1 libbdplus0 libbluray2 libcddb2 libchromaprint1 libcodec2-0.9 libdc1394-22 libdca0 libdouble-conversion3 libdvbpsi10 libdvdnav4 libdvdread7 libebml4v5 libfaad2 libgme0 libgroupsock8 libgsm1 libigdgmm11 libixml10 libkate1 liblirc-client0 liblivemedia77 liblua5.2-0 libmad0 libmatroska6v5 libmpcdec6 libmpeg2-4 libmysofa1 libopenmpt-modplug1 libopenmpt0 libpcre2-16-0 libplacebo7 libpostproc55 libprotobuf-lite17 libproxy-tools libqt5core5a libqt5dbus5 libqt5gui5 libqt5network5 libqt5svg5 libqt5widgets5 libqt5x11extras5 libresid-builder0c2a libsdl-image1.2 libsdl1.2debian libshine3 libsidplay2 libsnappy1v5 libsndio7.0 libspatialaudio0 libsrt1 libssh-gcrypt-4 libssh2-1 libswresample3 libswscale5 libupnp13 libusageenvironment3 libva-drm2 libva-wayland2 libva-x11-2 libva2 libvdpau1 libvlc-bin libvlc5 libvlccore9 libx264-155 libx265-179 libxcb-xinerama0 libxcb-xinput0 libxvidcore4 libzvbi-common libzvbi0 mesa-va-drivers mesa-vdpau-drivers ocl-icd-libopencl1 qt5-gtk-platformtheme qttranslations5-l10n va-driver-all vdpau-driver-all vlc vlc-bin vlc-data vlc-l10n vlc-plugin-base vlc-plugin-notify vlc-plugin-qt vlc-plugin-samba vlc-plugin-skins2 vlc-plugin-video-output vlc-plugin-video-splitter vlc-plugin-visualization" VERSION_ID=$(grep "^VERSION_ID" /etc/os-release | cut -d "\"" -f 2) @@ -23,12 +25,17 @@ VERSION_ID=$(grep "^VERSION_ID" /etc/os-release | cut -d "\"" -f 2) if [ "${VERSION_ID}" = "18.04" ]; then MISSING_LIBS="${MISSING_LIBS_OS11}" IGELOS_ID="OS11" + IGELOS_ID_VER="OS1108" + OS11_CLEAN="${OS11_CLEAN1108}" elif [ "${VERSION_ID}" = "22.04" ]; then MISSING_LIBS="${MISSING_LIBS_OS11}" IGELOS_ID="OS11" + IGELOS_ID_VER="OS1109" + OS11_CLEAN="${OS11_CLEAN1109}" elif [ "${VERSION_ID}" = "20.04" ]; then MISSING_LIBS="${MISSING_LIBS_OS12}" IGELOS_ID="OS12" + IGELOS_ID_VER="OS12" else echo "Not a valid Ubuntu OS release. pre OS11.09 needs 18.04 (bionic), OS11.09+ needs 22.04 (jammy), and OS12 needs 20.04 (focal)." exit 1 @@ -106,7 +113,7 @@ sed -i "/^version=/c version=\"${VERSION}\"" target/${CP}.inf tar cvjf target/${CP}.tar.bz2 ${CP} ${CP}-cp-init-script.sh zip -g ../${ZIP_FILE}.zip target/${CP}.tar.bz2 target/${CP}.inf zip -d ../${ZIP_FILE}.zip "target/build/*" "target/igel/*" "target/target/*" -mv ../${ZIP_FILE}.zip ../../${ZIP_FILE}-${VERSION}_${IGELOS_ID}_igel01.zip +mv ../${ZIP_FILE}.zip ../../${ZIP_FILE}-${VERSION}_${IGELOS_ID_VER}_igel01.zip cd ../.. rm -rf build_tar \ No newline at end of file