/[packages]/cauldron/mesa/current/SPECS/mesa.spec
ViewVC logotype

Diff of /cauldron/mesa/current/SPECS/mesa.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 332630 by fwang, Sat Nov 17 01:29:15 2012 UTC revision 332631 by anssi, Tue Dec 18 17:11:38 2012 UTC
# Line 25  Line 25 
25  %define name                    mesa  %define name                    mesa
26  %define fversion                9.0.1  %define fversion                9.0.1
27  %define version                 9.0.1  %define version                 9.0.1
28  %define rel                     1  %define rel                     2
29    
30  %define release                 %mkrel %{rel}  %define release                 %mkrel %{rel}
31  %define src_type tar.bz2  %define src_type tar.bz2
# Line 169  Source3:       make-git-snapshot.sh Line 169  Source3:       make-git-snapshot.sh
169  # git am ../03??-*.patch  # git am ../03??-*.patch
170  # git branch mdv-patches  # git branch mdv-patches
171  # git am ../09??-*.patch  # git am ../09??-*.patch
 Source101: 0001-Fix-undefined-symbols-in-libOSMesa-and-libglapi.patch  
172  # In order to update to the branch via patches, issue this command:  # In order to update to the branch via patches, issue this command:
173  # git format-patch --start-number 100 mesa_7_5_1..mesa_7_5_branch | sed 's/^0\([0-9]\+\)-/Patch\1: 0\1-/'  # git format-patch --start-number 100 mesa_7_5_1..mesa_7_5_branch | sed 's/^0\([0-9]\+\)-/Patch\1: 0\1-/'
174    
# Line 541  with the softpipe driver. Line 540  with the softpipe driver.
540  %apply_patches  %apply_patches
541  autoreconf -vfi  autoreconf -vfi
542    
543    # Duplicate source tree for OSMesa, since building both versions out-of-tree
544    # would break build. - Anssi 12/2012
545    all=$(ls)
546    mkdir -p build-osmesa
547    cp -a $all build-osmesa
548    
549  %build  %build
550  # fix build - TODO: should this be fixed in llvm somehow, or maybe the library  # fix build - TODO: should this be fixed in llvm somehow, or maybe the library
551  # symlinks should be moved to %{_libdir}? -Anssi 08/2012  # symlinks should be moved to %{_libdir}? -Anssi 08/2012
# Line 566  export LDFLAGS="-L%{_libdir}/llvm" Line 571  export LDFLAGS="-L%{_libdir}/llvm"
571                  --enable-openvg \                  --enable-openvg \
572                  --enable-gallium-egl \                  --enable-gallium-egl \
573                  --enable-gallium-g3dvl \                  --enable-gallium-g3dvl \
                 --enable-osmesa \  
574                  --disable-xvmc \                  --disable-xvmc \
575                  --enable-vdpau \                  --enable-vdpau \
576                  --disable-va \                  --disable-va \
# Line 582  export LDFLAGS="-L%{_libdir}/llvm" Line 586  export LDFLAGS="-L%{_libdir}/llvm"
586  %endif  %endif
587                  # end of configure options                  # end of configure options
588    
589    
590    # Build OSMesa separately, since we want to build OSMesa without shared-glapi,
591    # since doing that causes OSMesa to miss the OpenGL symbols.
592    # See e.g. https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/1066599
593    # -Anssi 12/2012
594    
595    pushd build-osmesa
596    %configure2_5x \
597                    --enable-osmesa \
598                    --disable-dri \
599                    --disable-glx \
600                    --disable-egl \
601                    --disable-shared-glapi \
602                    --without-gallium-drivers
603    popd
604    
605  %make  %make
606    %make -C build-osmesa
607    
608  %install  %install
609    %makeinstall_std -C build-osmesa
610  %makeinstall_std  %makeinstall_std
611    
612  # FIXME: strip will likely break the hardlink  # FIXME: strip will likely break the hardlink

Legend:
Removed from v.332630  
changed lines
  Added in v.332631

  ViewVC Help
Powered by ViewVC 1.1.26