Andreas Boll wrote:
Until we have jobermayr's shared libs patches,
don't link libgallium.la twice.

Fixes
http://lists.freedesktop.org/archives/mesa-dev/2013-January/032515.html

Thanks, I tested and it does fix build for me.

A couple of things I notice - before on my new/normal 64bit setup /lib/vdpau would look like -

lrwxrwxrwx 1 root root 18 Dec 19 23:28 libvdpau_r600.so -> libvdpau_r600.so.1 lrwxrwxrwx 1 root root 20 Dec 19 23:28 libvdpau_r600.so.1 -> libvdpau_r600.so.1.0
-rwxr-xr-x 1 root root  27M Dec 19 23:28 libvdpau_r600.so.1.0
lrwxrwxrwx 1 root root 22 Dec 19 23:28 libvdpau_softpipe.so -> libvdpau_softpipe.so.1 lrwxrwxrwx 1 root root 24 Dec 19 23:28 libvdpau_softpipe.so.1 -> libvdpau_softpipe.so.1.0
-rwxr-xr-x 1 root root  27M Dec 19 23:28 libvdpau_softpipe.so.1.0
-rwxr-xr-x 1 root root  985 Dec  9 13:56 libvdpau_trace.la
lrwxrwxrwx 1 root root 23 Dec 9 13:56 libvdpau_trace.so -> libvdpau_trace.so.1.0.0 lrwxrwxrwx 1 root root 23 Dec 9 13:56 libvdpau_trace.so.1 -> libvdpau_trace.so.1.0.0
-rwxr-xr-x 1 root root 147K Dec  9 13:56 libvdpau_trace.so.1.0.0

After it's like below the libs have an extra .0 and the old ones are still there.

-rwxr-xr-x 1 root root 1.8K Jan 11 15:01 libvdpau_r600.la
lrwxrwxrwx 1 root root 22 Jan 11 15:01 libvdpau_r600.so -> libvdpau_r600.so.1.0.0 lrwxrwxrwx 1 root root 22 Jan 11 15:01 libvdpau_r600.so.1 -> libvdpau_r600.so.1.0.0
-rwxr-xr-x 1 root root  27M Dec 19 23:28 libvdpau_r600.so.1.0
-rwxr-xr-x 1 root root  31M Jan 11 15:01 libvdpau_r600.so.1.0.0
-rwxr-xr-x 1 root root 1.7K Jan 11 15:01 libvdpau_softpipe.la
lrwxrwxrwx 1 root root 26 Jan 11 15:01 libvdpau_softpipe.so -> libvdpau_softpipe.so.1.0.0 lrwxrwxrwx 1 root root 26 Jan 11 15:01 libvdpau_softpipe.so.1 -> libvdpau_softpipe.so.1.0.0
-rwxr-xr-x 1 root root  27M Dec 19 23:28 libvdpau_softpipe.so.1.0
-rwxr-xr-x 1 root root  30M Jan 11 15:01 libvdpau_softpipe.so.1.0.0
-rwxr-xr-x 1 root root  985 Dec  9 13:56 libvdpau_trace.la
lrwxrwxrwx 1 root root 23 Dec 9 13:56 libvdpau_trace.so -> libvdpau_trace.so.1.0.0 lrwxrwxrwx 1 root root 23 Dec 9 13:56 libvdpau_trace.so.1 -> libvdpau_trace.so.1.0.0
-rwxr-xr-x 1 root root 147K Dec  9 13:56 libvdpau_trace.so.1.0.0

Now on my old wacky 32bit setup I have some renamed libs which let me test different versions/hacks at runtime using VDPAU_DRIVER=xxxx

I guess I just lucked into this working till now, but after installing under the new build system I have ended up getting an ancient version instead of the new one as highlighted below.

lrwxrwxrwx 1 andy andy 21 2012-10-22 19:37 libvdpau_r600bob.so -> libvdpau_r600bob.so.1 lrwxrwxrwx 1 andy andy 23 2012-10-22 19:37 libvdpau_r600bob.so.1 -> libvdpau_r600bob.so.1.0
-rwxr-xr-x 1 andy andy  27M 2012-12-30 00:20 libvdpau_r600bob.so.1.0

lrwxrwxrwx 1 andy andy 20 2012-03-07 17:01 libvdpau_r600ck.so -> libvdpau_r600ck.so.1 lrwxrwxrwx 1 andy andy 22 2012-03-07 17:01 libvdpau_r600ck.so.1 -> libvdpau_r600ck.so.1.0
-rwxrwxr-x 1 andy andy 4.1M 2012-03-30 12:49 libvdpau_r600ck.so.1.0

-rwxr-xr-x 1 andy andy 2.3K 2013-01-11 14:14 libvdpau_r600.la
lrwxrwxrwx 1 andy andy 22 2013-01-11 14:14 libvdpau_r600.so -> libvdpau_r600.so.1.0.0 lrwxrwxrwx 1 andy andy 22 2013-01-11 14:14 libvdpau_r600.so.1 -> libvdpau_r600ck.so.1.0

New link to old lib

-rwxr-xr-x 1 andy andy  27M 2013-01-09 10:22 libvdpau_r600.so.1.0
-rwxr-xr-x 1 andy andy  31M 2013-01-11 14:14 libvdpau_r600.so.1.0.0
-rwxr-xr-x 1 andy andy 2.1K 2013-01-11 14:14 libvdpau_softpipe.la
lrwxrwxrwx 1 andy andy 26 2013-01-11 14:14 libvdpau_softpipe.so -> libvdpau_softpipe.so.1.0.0 lrwxrwxrwx 1 andy andy 20 2013-01-11 14:14 libvdpau_softpipe.so.1 -> libvdpau_spck.so.1.0

New link to old lib

-rwxr-xr-x 1 andy andy  27M 2013-01-06 16:36 libvdpau_softpipe.so.1.0
-rwxr-xr-x 1 andy andy  30M 2013-01-11 14:14 libvdpau_softpipe.so.1.0.0
lrwxrwxrwx 1 andy andy 18 2012-03-11 18:16 libvdpau_spck.so -> libvdpau_spck.so.1 lrwxrwxrwx 1 andy andy 20 2012-03-11 18:16 libvdpau_spck.so.1 -> libvdpau_spck.so.1.0
-rwxrwxr-x 1 andy andy 4.3M 2012-03-30 12:49 libvdpau_spck.so.1.0









_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to