diff options
author | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-09-22 15:25:32 +0200 |
---|---|---|
committer | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-12-09 11:41:38 +0100 |
commit | f3880bb35eb8d0dbe4ba7d4a5744a135b340c821 (patch) | |
tree | 82a96878cfb0f869395154bc6bcec9a919a840fb | |
parent | 4c0c75776dad209debc8b5bdc21355e33ffd745b (diff) | |
download | mesa-tizen_3.0.2014.q4_common.tar.gz mesa-tizen_3.0.2014.q4_common.tar.bz2 mesa-tizen_3.0.2014.q4_common.zip |
Packaging: use %__make macrotizen_3.0_ivi_releasesubmit/tizen_wearable/20150102.000000submit/tizen_tv/20151202.000000submit/tizen_mobile/20151202.000001submit/tizen_mobile/20141231.012840submit/tizen_mobile/20141216.000000submit/tizen_ivi/20141222.222222submit/tizen_common/20141209.124322accepted/tizen/wearable/20150105.054717accepted/tizen/tv/20150105.022357accepted/tizen/mobile/20150105.022531accepted/tizen/ivi/20141222.112654accepted/tizen/common/20141210.081141tizen_3.0_ivitizen_3.0.2015.q1_commontizen_3.0.2014.q4_common
Also:
* Correct some rpmlint errors/warnings.
* Use %reconfigure macro.
Change-Id: I3389d0fe43992b2ca03e4eacb242354b57fc35f1
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
-rw-r--r-- | packaging/mesa.spec | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/packaging/mesa.spec b/packaging/mesa.spec index 9979930c0af..3037da46a06 100644 --- a/packaging/mesa.spec +++ b/packaging/mesa.spec @@ -120,7 +120,7 @@ programs against the GL library. %endif %package -n libwayland-egl -Summary: Wayland EGL backend for Mesa +Summary: Wayland EGL backend %description -n libwayland-egl Wayland EGL backend for Mesa. @@ -158,7 +158,7 @@ programs against the EGL library. %ifarch %ix86 x86_64 %package -n mesa-gallium-pipe # Kudos to Debian for the descriptions -Summary: Free implementation of Gallium-pipe API +Summary: Gallium-pipe API %description -n mesa-gallium-pipe Gallium @@ -300,48 +300,49 @@ rm -rf docs/README.{VMS,WIN32,OS2} %build -%install rm -f src/mesa/depend -autoreconf -fi -%configure --enable-gles1 \ - --enable-gles2 \ - --disable-dri3 \ +%reconfigure --enable-gles1 \ + --enable-gles2 \ + --disable-dri3 \ %if %{with x} %if %{with wayland} - --with-egl-platforms=drm,wayland,x11 \ + --with-egl-platforms=drm,wayland,x11 \ %else - --with-egl-platforms=drm,x11 \ + --with-egl-platforms=drm,x11 \ %endif %else %if %{with wayland} - --with-egl-platforms=drm,wayland \ - --disable-glx \ + --with-egl-platforms=drm,wayland \ + --disable-glx \ %else - --with-egl-platforms=drm \ - --disable-glx \ + --with-egl-platforms=drm \ + --disable-glx \ %endif %endif - --enable-shared-glapi \ - --enable-texture-float \ + --enable-shared-glapi \ + --enable-texture-float \ %if %glamor - --enable-gbm \ + --enable-gbm \ %endif - --with-dri-searchpath=/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri \ + --with-dri-searchpath=/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri \ %ifarch %ix86 x86_64 - --enable-gallium-egl \ - --enable-gallium-llvm \ - --with-dri-drivers=i915,i965,swrast \ - --with-gallium-drivers="i915,svga,swrast" \ - --enable-xa \ + --enable-gallium-egl \ + --enable-gallium-llvm \ + --with-dri-drivers=i915,i965,swrast \ + --with-gallium-drivers="i915,svga,swrast" \ + --enable-xa \ %else - --disable-gallium-egl \ + --disable-gallium-egl \ %endif %ifarch %arm aarch64 - --with-dri-drivers=swrast \ - --with-gallium-drivers="" \ + --with-dri-drivers=swrast \ + --with-gallium-drivers="" \ %endif - CFLAGS="%{optflags} -DNDEBUG" -make %{?_smp_mflags} + CFLAGS="%{optflags} -DNDEBUG" + +%__make %{?_smp_mflags} + +%install %make_install %if !%{with x} @@ -396,7 +397,7 @@ install -m 644 $RPM_SOURCE_DIR/drirc %{buildroot}/etc %defattr(-,root,root) %license docs/COPYING %config %{_sysconfdir}/drirc -%{_libdir}/dri/ +%{_libdir}/dri %if %{with x} %files -n mesa-libGL @@ -499,7 +500,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc %{buildroot}/etc %{_libdir}/libgbm.so %{_libdir}/pkgconfig/gbm.pc - %files -n mesa-libglapi %manifest %{name}.manifest %defattr(-,root,root) @@ -514,5 +514,3 @@ install -m 644 $RPM_SOURCE_DIR/drirc %{buildroot}/etc %{_libdir}/pkgconfig/wayland-egl.pc %endif %{_libdir}/pkgconfig/dri.pc - -%changelog |