From e66f8e155e6cc7428c150659cd8af46b2d2cafdc Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Wed, 15 Feb 2023 20:57:05 +0900 Subject: [PATCH] Fix build error with tizen_profile_name "tv" - "gstva_dep" is not defined with tizen_profile_name "tv", but it's not excluded. - The files related "cuda" should also excluded with tizen_profile_name "tv". [Version] 1.22.0-12 [Issue Type] Build error Change-Id: I94e9d4a67d2e42dc3ec1866d1e33d115155841e7 Signed-off-by: Jeongmo Yang --- packaging/gstreamer.spec | 10 +++++----- subprojects/gst-plugins-bad/sys/meson.build | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec index 17ef711..0543f4a 100644 --- a/packaging/gstreamer.spec +++ b/packaging/gstreamer.spec @@ -62,7 +62,7 @@ Name: %{_name} Version: 1.22.0 -Release: 11 +Release: 12 Summary: Streaming-Media Framework Runtime License: LGPL-2.0+ Group: Multimedia/Framework @@ -1103,6 +1103,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgstadaptivedemux-%{gst_branch}.so.0* %{_libdir}/libgstbadaudio-%{gst_branch}.so.0* %{_libdir}/libgstbasecamerabinsrc-%{gst_branch}.so.0* +%{_libdir}/libgstcuda-%{gst_branch}.so.0* %{_libdir}/libgstinsertbin-%{gst_branch}.so.0* %{_libdir}/libgstisoff-%{gst_branch}.so.0* %{_libdir}/libgstphotography-%{gst_branch}.so.0* @@ -1146,7 +1147,6 @@ rm -rf $RPM_BUILD_ROOT %{_lib_gstreamer_dir}/libgstwebrtc.so %{_libdir}/libgstcodecparsers-%{gst_branch}.so.0* %{_libdir}/libgstcodecs-%{gst_branch}.so.0* -%{_libdir}/libgstcuda-%{gst_branch}.so.0* %{_libdir}/libgstmpegts-%{gst_branch}.so.0* %{_libdir}/libgstsctp-%{gst_branch}.so.0* %{_libdir}/libgsttranscoder-%{gst_branch}.so.0* @@ -1166,6 +1166,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/gstreamer-%{gst_branch}/gst/audio/gstnonstreamaudiodecoder.h %{_includedir}/gstreamer-%{gst_branch}/gst/audio/gstplanaraudioadapter.h %{_includedir}/gstreamer-%{gst_branch}/gst/basecamerabinsrc/* +%{_includedir}/gstreamer-%{gst_branch}/gst/cuda/* %{_includedir}/gstreamer-%{gst_branch}/gst/insertbin/* %{_includedir}/gstreamer-%{gst_branch}/gst/interfaces/* %{_includedir}/gstreamer-%{gst_branch}/gst/isoff/* @@ -1174,7 +1175,6 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/gstreamer-%{gst_branch}/gst/uridownloader/* %endif %{_includedir}/gstreamer-%{gst_branch}/gst/codecparsers/* -%{_includedir}/gstreamer-%{gst_branch}/gst/cuda/* %{_includedir}/gstreamer-%{gst_branch}/gst/mpegts/* %{_includedir}/gstreamer-%{gst_branch}/gst/sctp/* %{_includedir}/gstreamer-%{gst_branch}/gst/transcoder/* @@ -1186,6 +1186,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgstadaptivedemux*.so %{_libdir}/libgstbadaudio*.so %{_libdir}/libgstbasecamerabinsrc*.so +%{_libdir}/libgstcuda*.so %{_libdir}/libgstinsertbin*.so %{_libdir}/libgstisoff*.so %{_libdir}/libgstphotography*.so @@ -1198,7 +1199,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgstcodecparsers*.so %{_libdir}/libgstcodecs*.so -%{_libdir}/libgstcuda*.so %{_libdir}/libgstmpegts*.so %{_libdir}/libgstsctp*.so %{_libdir}/libgsttranscoder*.so @@ -1209,6 +1209,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/gstreamer-codecparsers-%{gst_branch}.pc %if "%{tizen_profile_name}" != "tv" %{_libdir}/pkgconfig/gstreamer-bad-audio-%{gst_branch}.pc +%{_libdir}/pkgconfig/gstreamer-cuda-%{gst_branch}.pc %{_libdir}/pkgconfig/gstreamer-insertbin-%{gst_branch}.pc %{_libdir}/pkgconfig/gstreamer-photography-%{gst_branch}.pc %{_libdir}/pkgconfig/gstreamer-play-%{gst_branch}.pc @@ -1217,7 +1218,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/gstreamer-gl-*.pc %endif # gl %endif # profile -%{_libdir}/pkgconfig/gstreamer-cuda-%{gst_branch}.pc %{_libdir}/pkgconfig/gstreamer-mpegts-%{gst_branch}.pc %{_libdir}/pkgconfig/gstreamer-plugins-bad-%{gst_branch}.pc %{_libdir}/pkgconfig/gstreamer-sctp-%{gst_branch}.pc diff --git a/subprojects/gst-plugins-bad/sys/meson.build b/subprojects/gst-plugins-bad/sys/meson.build index cfe1778..74f0d50 100644 --- a/subprojects/gst-plugins-bad/sys/meson.build +++ b/subprojects/gst-plugins-bad/sys/meson.build @@ -22,7 +22,9 @@ subdir('shm') subdir('tinyalsa') subdir('uvch264') subdir('v4l2codecs') +if not (get_option('tv-profile')) subdir('va') +endif subdir('wasapi') subdir('wasapi2') subdir('wic') -- 2.7.4