From 732482a4c124ebc4bf9a58accd77eb26c8593c34 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 3 Feb 2014 16:22:48 +0100 Subject: [PATCH 1/3] Add _with_xa when arch is arm and _with_freedreeno According to the build instructions for freedreeno https://github.com/freedreno/freedreno/wiki/Git-Trees-%26-Branches#build-instructions the driver requires the xa state tracker to be enabled --- mesa.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mesa.spec b/mesa.spec index 751be04..60312b3 100644 --- a/mesa.spec +++ b/mesa.spec @@ -25,6 +25,7 @@ %ifarch %{arm} %define with_freedreno 1 +%define with_xa 1 %endif %ifarch s390 s390x ppc64le From 7aa0856ccbde509dad94c41d4204d2e606499cc2 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 3 Feb 2014 16:21:09 +0100 Subject: [PATCH 2/3] Split _with_xa from _with_vmware --- mesa.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mesa.spec b/mesa.spec index 60312b3..ce4410a 100644 --- a/mesa.spec +++ b/mesa.spec @@ -39,6 +39,7 @@ %ifarch %{ix86} x86_64 %define platform_drivers ,i915,i965 %define with_vmware 1 +%define with_xa 1 %define with_opencl 1 %endif %ifarch ppc ppc64le @@ -271,14 +272,14 @@ Mesa libwayland-egl development package %endif -%if 0%{?with_vmware} +%if 0%{?with_xa} %package libxatracker -Summary: Mesa XA state tracker for vmware +Summary: Mesa XA state tracker Group: System Environment/Libraries Provides: libxatracker %description libxatracker -Mesa XA state tracker for vmware +Mesa XA state tracker %package libxatracker-devel Summary: Mesa XA state tracker development package @@ -387,7 +388,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope %{?with_llvm:--with-llvm-shared-libs} \ --enable-dri \ %if %{with_hardware} - %{?with_vmware:--enable-xa} \ + %{?with_xa:--enable-xa} \ --with-gallium-drivers=%{?with_vmware:svga,}%{?with_radeonsi:radeonsi,}%{?with_llvm:swrast,r600,}%{?with_freedreno:freedreno,}r300,nouveau \ %else --with-gallium-drivers=%{?with_llvm:swrast} \ @@ -453,7 +454,7 @@ rm -rf $RPM_BUILD_ROOT %post libwayland-egl -p /sbin/ldconfig %postun libwayland-egl -p /sbin/ldconfig %endif -%if 0%{?with_vmware} +%if 0%{?with_xa} %post libxatracker -p /sbin/ldconfig %postun libxatracker -p /sbin/ldconfig %endif @@ -616,7 +617,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/wayland-egl.pc %endif -%if 0%{?with_vmware} +%if 0%{?with_xa} %files libxatracker %defattr(-,root,root,-) %doc docs/COPYING From 9487c811f49d605f8d448e238e4d04f8e0b1cc04 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 9 Feb 2014 11:14:05 +0100 Subject: [PATCH 3/3] Enable omx on x86 and arm --- mesa.spec | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mesa.spec b/mesa.spec index ce4410a..f48e89f 100644 --- a/mesa.spec +++ b/mesa.spec @@ -26,6 +26,7 @@ %ifarch %{arm} %define with_freedreno 1 %define with_xa 1 +%define with_omx 1 %endif %ifarch s390 s390x ppc64le @@ -41,6 +42,7 @@ %define with_vmware 1 %define with_xa 1 %define with_opencl 1 +%define with_omx 1 %endif %ifarch ppc ppc64le %define platform_drivers ,swrast @@ -130,6 +132,9 @@ BuildRequires: mesa-libGL-devel BuildRequires: libvdpau-devel %endif BuildRequires: zlib-devel +%if 0%{?with_omx} +BuildRequires: libomxil-bellagio-devel +%endif %if 0%{?with_opencl} BuildRequires: libclc-devel llvm-static opencl-filesystem %endif @@ -176,6 +181,16 @@ Obsoletes: mesa-dri-llvmcore <= 7.12 %description dri-drivers Mesa-based DRI drivers. +%if 0%{?with_omx} +%package omx-drivers +Summary: Mesa-based OMX drivers +Group: User Interface/X Hardware Support +Requires: mesa-filesystem%{?_isa} +Requires: libomxil-bellagio%{?_isa} +%description omx-drivers +Mesa-based OMX drivers. +%endif + %if 0%{?with_vdpau} %package vdpau-drivers Summary: Mesa-based DRI drivers @@ -381,6 +396,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope --with-egl-platforms=x11,drm%{?with_wayland:,wayland} \ --enable-shared-glapi \ --enable-gbm \ + %{?with_omx:--enable-omx} \ %{?with_opencl:--enable-opencl --enable-opencl-icd --with-clang-libdir=%{_prefix}/lib} %{!?with_opencl:--disable-opencl} \ --enable-glx-tls \ --enable-texture-float=yes \ @@ -527,6 +543,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/dri/swrast_dri.so %if %{with_hardware} +%if 0%{?with_omx} +%files omx-drivers +%defattr(-,root,root,-) +%{_libdir}/bellagio/libomx_nouveau.so* +%{_libdir}/bellagio/libomx_r600.so* +%{_libdir}/bellagio/libomx_radeonsi.so* +%endif %if 0%{?with_vdpau} %files vdpau-drivers %defattr(-,root,root,-)