!29 [sync] PR-28: remove rpath

From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng
remove rpath
2022-12-08 11:25:46 +00:00 · 2022-12-08 18:02:34 +08:00 · 2022-11-18 07:45:33 +00:00 · 2022-11-18 15:24:59 +08:00 · 2022-10-29 01:08:41 +00:00 · 2022-10-28 11:49:05 +08:00
2 changed files with 109 additions and 3 deletions
--- a/libdrm-2.4.109-sw.patch
+++ b/libdrm-2.4.109-sw.patch
@ -0,0 +1,75 @@
+diff -Nuar libdrm-2.4.109.org/include/drm/drm_sarea.h libdrm-2.4.109.sw/include/drm/drm_sarea.h
+--- libdrm-2.4.109.org/include/drm/drm_sarea.h	2022-02-26 01:16:04.810000000 +0000
+++ libdrm-2.4.109.sw/include/drm/drm_sarea.h	2022-02-26 04:13:03.090000000 +0000
+@@ -39,7 +39,9 @@
+ #endif
+ 
+ /* SAREA area needs to be at least a page */
+-#if defined(__alpha__)
+#if defined(__sw_64__)
+#define SAREA_MAX                       0x2000U
+#elif defined(__alpha__)
+ #define SAREA_MAX                       0x2000U
+ #elif defined(__mips__)
+ #define SAREA_MAX                       0x4000U
+diff -Nuar libdrm-2.4.109.org/xf86drm.c libdrm-2.4.109.sw/xf86drm.c
+--- libdrm-2.4.109.org/xf86drm.c	2022-02-26 01:16:04.840000000 +0000
+++ libdrm-2.4.109.sw/xf86drm.c	2022-02-26 02:33:50.700000000 +0000
+@@ -1044,7 +1044,7 @@
+             sv.drm_dd_major = -1;        /* Don't care */
+             sv.drm_dd_minor = -1;        /* Don't care */
+             if (drmSetInterfaceVersion(fd, &sv)) {
+-#ifndef __alpha__
+#ifndef __sw_64__
+                 pci_domain_ok = 0;
+ #endif
+                 sv.drm_di_major = 1;
+diff -Nuar libdrm-2.4.109.org/xf86drm.h libdrm-2.4.109.sw/xf86drm.h
+--- libdrm-2.4.109.org/xf86drm.h	2022-02-26 01:16:04.840000000 +0000
+++ libdrm-2.4.109.sw/xf86drm.h	2022-02-26 04:11:01.090000000 +0000
+@@ -382,6 +382,34 @@
+ 			  "r" (new));                                  \
+ 	} while (0)
+ 
+#elif defined(__sw_64__)
+#define DRM_CAS(lock, old, new, ret)            \
+        do{                                     \
+                int tmp, old32;                 \
+                int tmp1;                       \
+                __asm__ __volatile__(           \
+                "       addw    $31, %6, %4\n"  \
+                "       ldi     %1, %3\n"       \
+                "1:     lldw    %0, 0(%1)\n"    \
+                "       cmpeq   %0, %4, %2\n"   \
+                "       wr_f    %2\n"           \
+                "       mov     %5, %0\n"       \
+                "       lstw    %0, 0(%1)\n"    \
+                "       rd_f    %0\n"           \
+                "       beq     %2, 2f\n"       \
+                "       beq     %0, 3f\n"       \
+                "       memb\n"                 \
+                "2:     cmpeq   %2, 0, %2\n"    \
+                ".subsection 2\n"               \
+                "3:     br      1b\n"           \
+                ".previous"                     \
+                : "=&r"(tmp),"=&r"(tmp1), "=&r"(ret),   \
+                  "=m"(__drm_dummy_lock(lock)), \
+                  "=&r"(old32)                  \
+                : "r"(new), "r"(old)            \
+                : "memory");                    \
+        } while (0)
+
+ #elif defined(__alpha__)
+ 
+ #define	DRM_CAS(lock, old, new, ret)		\
+@@ -511,7 +539,9 @@
+ #define DRM_CAS(lock,old,new,ret) do { ret=1; } while (0) /* FAST LOCK FAILS */
+ #endif
+ 
+-#if defined(__alpha__)
+#if defined(__sw_64__)
+#define DRM_CAS_RESULT(_result)		long _result
+#elif defined(__alpha__)
+ #define DRM_CAS_RESULT(_result)		long _result
+ #elif defined(__powerpc__)
+ #define DRM_CAS_RESULT(_result)		int _result
--- a/libdrm.spec
+++ b/libdrm.spec
@ -47,7 +47,7 @@ end}

 Name:           libdrm
 Version:        2.4.109
-Release:        1
+Release:        7
 License:        MIT
 Summary:        library for direct rendering manager

@ -56,7 +56,7 @@ Source0:        https://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.xz
 Source1:	https://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.xz.sig
 Source2:        91-drm-modeset.rules

-BuildRequires:  meson >= 0.43  gcc libatomic_ops-devel kernel-headers
+BuildRequires:  meson >= 0.43  gcc kernel-headers
 %if %{with intel}
 BuildRequires:  pkgconfig(pciaccess) >= 0.10
 %endif
@ -69,15 +69,20 @@ BuildRequires:  %{_bindir}/xsltproc
 BuildRequires:  %{_bindir}/sed
 BuildRequires:  python3-docutils chrpath
 %endif
+%if %{?openEuler:1}0
 %if %{with valgrind}
 BuildRequires:  valgrind-devel
 %endif
+%endif
 %if %{with udev}
 BuildRequires:  pkgconfig(udev)
 %endif

 Patch1001:      %{name}-make-dri-perms-okay.patch
 Patch1002:      %{name}-2.4.0-no-bc.patch
+%ifarch sw_64
+Patch1003:      libdrm-2.4.109-sw.patch
+%endif

 %description
 %{name} provides a user space library for accessing the DRM, direct rendering manager, 
@ -113,11 +118,17 @@ Utility programs for the kernel DRM interface.
  %{bcond_meson libkms} %{bcond_meson intel} %{bcond_meson radeon} %{bcond_meson amdgpu}                \
  %{bcond_meson nouveau} %{bcond_meson vmwgfx} %{bcond_meson omap} %{bcond_meson exynos}                \
  %{bcond_meson freedreno} %{bcond_meson tegra} %{bcond_meson vc4} %{bcond_meson etnaviv}               \
-  %{bcond_meson cairo_tests} %{bcond_meson man_pages} %{bcond_meson valgrind}              \
+  %{bcond_meson cairo_tests} %{bcond_meson man_pages} \
+%if %{?openEuler:1}0
+  %{bcond_meson valgrind} \
+%endif
  %{bcond_meson freedreno_kgsl} %{bcond_meson install_test_programs} %{bcond_meson udev}                  \
  %{nil}
 %meson_build

+%check
+%meson_test
+
 %install
 %meson_install
 %if %{with install_test_programs}
@ -129,6 +140,8 @@ install -Dpm0644 -t %{buildroot}%{_udevrulesdir} %{S:2}

 %ldconfig_scriptlets

+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/drmdevice
+
 %files
 %defattr(-,root,root)
 %{_libdir}/%{name}.so.*
@ -259,6 +272,24 @@ install -Dpm0644 -t %{buildroot}%{_udevrulesdir} %{S:2}
 %endif

 %changelog
+* Thu Dec 08 2022 zhouwenpei<zhouwenpei1@h-partners.com> - 2.4.109-7
+- remove rpath
+
+* Fri Nov 18 2022 zhouwenpei<zhouwenpei1@h-partners.com> - 2.4.109-6
+- Optimize the patch for add sw architecture
+
+* Fri Nov 18 2022 wuzx<wuzx1226@qq.com> - 2.4.109-5
+- Add sw64 architecture
+
+* Tue Oct 18 2022 Liu Zixian <liuzixian4@huawei.com> - 2.4.109-4
+- remove unused BuildRequires
+
+* Wed Mar 30 2022 liuyumeng <liuyumeng5@h-partners.com> - 2.4.109-3
+- enable tests
+
+* Tue Mar 1 2022 hanhui <hanhui15@h-partners.com> - 2.4.109-2
+* customized valgrind
+
 * Fri Dec 3 2021 xingxing <xingxing9@huawei.com> - 2.4.109-1
 - update to 2.4.109
Author	SHA1	Message	Date
openeuler-ci-bot	4e6db72140	!29 [sync] PR-28: remove rpath From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng	2022-12-08 11:25:46 +00:00
zhouwenpei	deeeb2b742	remove rpath (cherry picked from commit 478dd757fd9c4a65b42f8d7f2e115e58af641259)	2022-12-08 18:02:34 +08:00
openeuler-ci-bot	b4a73274fa	!25 [sync] PR-24: Add sw64 architecture From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng	2022-11-18 07:45:33 +00:00
zhouwenpei	db0bd7f807	Add sw64 architecture (cherry picked from commit 77529e716a2cdcfdb1fa32bb030397c5e8d83352)	2022-11-18 15:24:59 +08:00
openeuler-ci-bot	92cefe67e0	!22 [sync] PR-20: remove unused BuildRequires From: @openeuler-sync-bot Reviewed-by: @small_leek Signed-off-by: @small_leek	2022-10-29 01:08:41 +00:00
liqingqing_1229	0e0d75e19b	remove unused BuildRequires (cherry picked from commit 115932d703410cde198ef605ef9f1fc96f904ed8)	2022-10-28 11:49:05 +08:00
openeuler-ci-bot	fce7026375	!19 [sync] PR-17: enable tests From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng	2022-04-06 09:26:48 +00:00
liuyumeng	639372b772	enable tests (cherry picked from commit 945af641e57a13fb9df63f9538b44ab352eb0e62)	2022-04-06 14:42:36 +08:00
openeuler-ci-bot	cebd452214	!15 [sync] PR-13: 对valgrind的依赖进行定制化修改 From: @openeuler-sync-bot Reviewed-by: @dwl301 Signed-off-by: @dwl301	2022-03-01 08:15:52 +00:00
shirely16	11ff393806	customized valgrind Signed-off-by: shirely16 <hanhui_0117@126.com> (cherry picked from commit 166ac1cfcb24b7da0b598ba8ce23f4b261271430)	2022-03-01 16:02:06 +08:00