remove about legacy libtbm backend 50/276850/1 accepted/tizen_7.0_unified accepted/tizen_7.0_unified_hotfix tizen_7.0 tizen_7.0_hotfix accepted/tizen/7.0/unified/20221110.063241 accepted/tizen/7.0/unified/hotfix/20221116.104322 accepted/tizen/unified/20220628.220142 submit/tizen/20220627.072238 submit/tizen/20220628.044343 tizen_7.0_m2_release
authorChangyeon Lee <cyeon.lee@samsung.com>
Wed, 22 Jun 2022 08:49:07 +0000 (17:49 +0900)
committerChangyeon Lee <cyeon.lee@samsung.com>
Wed, 22 Jun 2022 08:49:07 +0000 (17:49 +0900)
Change-Id: I5f671ac91f40827feb28c6319a87fe97612f06fd

configure.ac
packaging/hal-backend-tbm-meson.manifest [new file with mode: 0644]
packaging/hal-backend-tbm-meson.spec [new file with mode: 0644]
packaging/libhal-backend-tbm-meson.manifest [deleted file]
packaging/libtbm-meson.spec [deleted file]

index 28cdd9f7bd2e82f85ae43231fd8aed6361b1f6d6..48bcc28b0417e6ad22a85556565dab9d89ef9c6d 100644 (file)
@@ -18,7 +18,7 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 AC_PREREQ(2.60)
-AC_INIT(libtbm-meson, 1.0.0)
+AC_INIT(hal-backend-tbm-meson, 1.0.0)
 AC_USE_SYSTEM_EXTENSIONS
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2])
@@ -37,7 +37,6 @@ AC_FUNC_ALLOCA
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 PKG_CHECK_MODULES(LIBDRM, libdrm)
-PKG_CHECK_MODULES(LIBTBM, libtbm)
 PKG_CHECK_MODULES(HAL_API_COMMON, hal-api-common)
 PKG_CHECK_MODULES(HAL_API_TBM, hal-api-tbm)
 PKG_CHECK_MODULES(DLOG, dlog)
@@ -51,10 +50,6 @@ AC_ARG_WITH(hal-libdir, AS_HELP_STRING([--with-hal-libdir=PATH], [hal backend li
 AC_DEFINE_UNQUOTED(HAL_LIBDIR, "${HAL_LIBDIR}", [Directory for hal backend library path])
 AC_SUBST(HAL_LIBDIR)
 
-bufmgr_dir=${libdir#*/}
-AC_SUBST(bufmgr_dir)
-
-# for libhal-backend-tbm-meson
 LIBHAL_BACKEND_TBM_MESON_CFLAGS="$HAL_API_COMMON_CFLAGS $HAL_API_TBM_CFLAGS $LIBDRM_CFLAGS $LIBDRM_MESON_CFLAGS $DLOG_CFLAGS $LIBUDEV_CFLAGS"
 LIBHAL_BACKEND_TBM_MESON_LIBS="$HAL_API_COMMON_LIBS $HAL_API_TBM_LIBS $LIBDRM_LIBS $LIBDRM_MESON_LIBS $DLOG_LIBS $LIBUDEV_LIBS"
 AC_SUBST(LIBHAL_BACKEND_TBM_MESON_CFLAGS)
@@ -70,5 +65,5 @@ echo "LDFLAGS : $LDFLAGS"
 echo "bufmgr_dir : $bufmgr_dir"
 echo "LIBHAL_BACKEND_TBM_MESON_CFLAGS : $LIBHAL_BACKEND_TBM_MESON_CFLAGS"
 echo "LIBHAL_BACKEND_TBM_MESON_LIBS   : $LIBHAL_BACKEND_TBM_MESON_LIBS"
-echo "hal-libdir : $HAL_LIBDIR"
+echo "HAL_LIBDIR : $HAL_LIBDIR"
 echo ""
diff --git a/packaging/hal-backend-tbm-meson.manifest b/packaging/hal-backend-tbm-meson.manifest
new file mode 100644 (file)
index 0000000..75b0fa5
--- /dev/null
@@ -0,0 +1,5 @@
+<manifest>
+    <request>
+        <domain name="_"/>
+    </request>
+</manifest>
diff --git a/packaging/hal-backend-tbm-meson.spec b/packaging/hal-backend-tbm-meson.spec
new file mode 100644 (file)
index 0000000..77e89c6
--- /dev/null
@@ -0,0 +1,50 @@
+Name:           hal-backend-tbm-meson
+Version:        1.0.1
+Release:        1
+License:        MIT
+Summary:        hal-backend-tbm module for meson
+Group:          System/Libraries
+Source0:        %{name}-%{version}.tar.gz
+Source1001:     %{name}.manifest
+
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(hal-api-common)
+BuildRequires:  pkgconfig(hal-api-tbm)
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  kernel-headers-amlogic
+BuildConflicts: linux-glibc-devel
+ExclusiveArch:  %{arm} aarch64
+
+%description
+description: hal tbm backend module for meson
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
+%build
+
+%reconfigure --prefix=%{_prefix} --libdir=%{_libdir} \
+                       --with-hal-libdir=%{_hal_libdir} \
+                       CFLAGS="${CFLAGS} -Wall -Werror" LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed"
+
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+
+%make_install
+
+%post
+if [ -f %{_hal_libdir}/libhal-backend-tbm.so ]; then
+    rm -rf %{_hal_libdir}/libhal-backend-tbm.so
+fi
+ln -s libhal-backend-tbm-meson.so %{_hal_libdir}/libhal-backend-tbm.so
+
+%postun -p /sbin/ldconfig
+
+%files
+%manifest %{name}.manifest
+%license COPYING
+%{_hal_libdir}/libhal-backend-*.so*
diff --git a/packaging/libhal-backend-tbm-meson.manifest b/packaging/libhal-backend-tbm-meson.manifest
deleted file mode 100644 (file)
index 75b0fa5..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-    <request>
-        <domain name="_"/>
-    </request>
-</manifest>
diff --git a/packaging/libtbm-meson.spec b/packaging/libtbm-meson.spec
deleted file mode 100644 (file)
index 6f93636..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-Name:           libtbm-meson
-Version:        1.0.1
-Release:        1
-License:        MIT
-Summary:        Tizen Buffer Manager - meson backend
-Group:          System/Libraries
-Source0:        %{name}-%{version}.tar.gz
-Source1001:        libhal-backend-tbm-meson.manifest
-
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(libtbm)
-BuildRequires:  pkgconfig(hal-api-common)
-BuildRequires:  pkgconfig(hal-api-tbm)
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(libudev)
-BuildRequires:  kernel-headers-amlogic
-BuildConflicts: linux-glibc-devel
-ExclusiveArch:  %{arm} aarch64
-
-%description
-descriptionion: Tizen Buffer manager backend module for meson
-
-%package -n hal-backend-tbm-meson
-Summary:       hal-backend-tbm module for meson
-Group:         System/Libraries
-Requires:      hal-api-tbm
-Requires:      hal-api-common
-
-%description -n hal-backend-tbm-meson
-descriptionion: hal tbm backend module for meson
-
-%prep
-%setup -q
-cp %{SOURCE1001} .
-
-%build
-
-%reconfigure --prefix=%{_prefix} --libdir=%{_libdir}/bufmgr \
-                       --with-hal-libdir=%{_hal_libdir} \
-                       CFLAGS="${CFLAGS} -Wall -Werror" LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed"
-
-make %{?_smp_mflags}
-
-%install
-rm -rf %{buildroot}
-
-%make_install
-
-%post -n hal-backend-tbm-meson
-if [ -f %{_hal_libdir}/libhal-backend-tbm.so ]; then
-    rm -rf %{_hal_libdir}/libhal-backend-tbm.so
-fi
-ln -s libhal-backend-tbm-meson.so %{_hal_libdir}/libhal-backend-tbm.so
-
-%postun -n hal-backend-tbm-meson -p /sbin/ldconfig
-
-%files -n hal-backend-tbm-meson
-%manifest libhal-backend-tbm-meson.manifest
-%license COPYING
-%{_hal_libdir}/libhal-backend-*.so*