Skip to content

Commit

Permalink
Gstreammer 1.24.10 upgrade.
Browse files Browse the repository at this point in the history
  • Loading branch information
iiordanov committed Dec 25, 2024
1 parent eaeaeb3 commit 91497df
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion remoteClientLib/jni/libs/build-deps.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ configsub_ver="bf654c7e"
configguess_ver="28d244f1"
openssl_ver="1.1.1w"
openssl_hash="cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8"
gstreamer_ver="1.24.9"
gstreamer_ver="1.24.10"
freerdp_ver="2.11.7"
setuptools_ver="v44.1.1"
soup_ver="2.41.2"
Expand Down
5 changes: 2 additions & 3 deletions remoteClientLib/jni/libs/build-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ build_cerbero() {

openssl_download_prefix="OpenSSL_$(echo ${openssl_ver} | sed 's/\./_/g')"
openssl_ver_array=($(echo ${openssl_ver} | grep -o .))
if [ "" -gt 1 ]
if [ "${openssl_ver_array[0]}" -gt 1 ]
then
openssl_download_prefix="openssl-${openssl_ver}"
sed -i "s|.*openssl/000.*||" cerbero/recipes/openssl.recipe
Expand All @@ -492,8 +492,7 @@ build_cerbero() {

echo "Running cerbero build for $1 in $(pwd)"
cerbero/cerbero-uninstalled -c cerbero/config/cross-android-universal.cbc build \
gnustl libjpeg-turbo pyparsing tiff gstreamer-1.0 glib glib-networking libxml2 pixman libsoup openssl \
cairo json-glib gst-android-1.0 gst-plugins-bad-1.0 gst-plugins-good-1.0 gst-plugins-base-1.0 gst-plugins-ugly-1.0 gst-libav-1.0 spiceglue
gstreamer-1.0 gst-android-1.0 gst-plugins-bad-1.0 gst-plugins-good-1.0 gst-plugins-base-1.0 gst-plugins-ugly-1.0 gst-libav-1.0 spiceglue

# Workaround for non-existent lib-pthread.la dpendency sneaking its way into some of the libraries.
sed -i 's/[^ ]*lib-pthread.la//' cerbero/build/dist/android_universal/*/lib/*la
Expand Down

0 comments on commit 91497df

Please sign in to comment.