Search
j0ke.net Open Build Service
>
Projects
>
virtualization
:
VMware
>
vmwaredsp
> vmwaredsp-suse_10.3_fixes.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File vmwaredsp-suse_10.3_fixes.patch of Package vmwaredsp
diff -ru ../old/vmwaredsp-1.3/runme.sh ./runme.sh --- ../old/vmwaredsp-1.3/runme.sh 2005-03-26 11:35:22.000000000 -0700 +++ ./runme.sh 2007-11-13 09:12:57.000000000 -0700 @@ -17,12 +17,12 @@ # If we have /usr/lib64 directory, use it for 64bit libraries. # If it does not exist, or if it is symlink, install it to /usr/lib/x86_64. -LIB32=/usr/lib -if [ -d /usr/lib64 -a ! -L /usr/lib64 ] +LIB32=$DESTDIR/usr/lib +if [ -d $DESTDIR/usr/lib64 -a ! -L $DESTDIR/usr/lib64 ] then - LIB64=/usr/lib64 + LIB64=$DESTDIR/usr/lib64 else - LIB64=/usr/lib/x86_64 + LIB64=$DESTDIR/usr/lib/x86_64 fi # 32bit libraries @@ -42,9 +42,9 @@ done # wrappers -install -c -d -m 755 /usr/bin/ -install -c -m 755 vmwareesd /usr/bin/ -install -c -m 755 vmwarearts /usr/bin/ +install -c -d -m 755 $DESTDIR/usr/bin/ +install -c -m 755 vmwareesd $DESTDIR/usr/bin/ +install -c -m 755 vmwarearts $DESTDIR/usr/bin/ trap - EXIT diff -ru ../old/vmwaredsp-1.3/src/32/Makefile ./src/32/Makefile --- ../old/vmwaredsp-1.3/src/32/Makefile 2005-03-26 11:24:24.000000000 -0700 +++ ./src/32/Makefile 2007-11-13 09:23:42.000000000 -0700 @@ -1,5 +1,8 @@ PLUGINS := libvmdsp_esd.so libvmdsp_arts.so +ARTS_CFLAGS = $(shell artsc-config --cflags) +ARTS_LIBS = $(shell artsc-config --libs) + default: all all: libvmdsp.so $(PLUGINS) @@ -8,10 +11,10 @@ LIBS_vmdsp_arts := -lartsc -L. -lvmdsp lib%.so: %.o - $(CC) -shared -Wl,-version-script=../$(@:lib%.so=%).map -o $@ $^ ${LIBS_$(@:lib%.so=%)} -lpthread -ldl -lc + $(CC) $(ARTS_LIBS) -shared -Wl,-version-script=../$(@:lib%.so=%).map -o $@ $^ ${LIBS_$(@:lib%.so=%)} -lpthread -ldl -lc %.o: %.c - $(CC) -c -W -Wall -O2 -fPIC -o $@ $^ + $(CC) $(ARTS_CFLAGS) -c -W -Wall -O2 -fPIC -o $@ $^ update: libvmdsp.so $(PLUGINS) install -c -m 644 libvmdsp.so ../../32 @@ -24,4 +27,4 @@ clean: rm -f *.so test execvmx *.o -VPATH = .. \ No newline at end of file +VPATH = .. diff -ru ../old/vmwaredsp-1.3/src/vmdsp_arts.c ./src/vmdsp_arts.c --- ../old/vmwaredsp-1.3/src/vmdsp_arts.c 2005-03-26 10:42:59.000000000 -0700 +++ ./src/vmdsp_arts.c 2007-11-13 09:01:42.000000000 -0700 @@ -2,7 +2,7 @@ #include "vmdsp_plugin.h" -#include "kde/artsc/artsc.h" +#include "artsc.h" #include <errno.h> #include <fcntl.h> diff -ru ../old/vmwaredsp-1.3/src/vmdsp.map ./src/vmdsp.map --- ../old/vmwaredsp-1.3/src/vmdsp.map 2005-03-19 15:02:11.000000000 -0700 +++ ./src/vmdsp.map 2007-11-13 08:49:02.000000000 -0700 @@ -14,6 +14,9 @@ GLIBC_2.2 { }; +GLIBC_2.2.5 { +}; + LIBVMDSP.INTERNAL { global: vmdsp_log;