> > > Index: Dude/SPECS/Makefile > =================================================================== > --- Dude/SPECS/Makefile (revision 2391) > +++ Dude/SPECS/Makefile (working copy) > @@ -28,7 +28,6 @@ > > # Temporary disable, Under construction on S10U5 > ifeq (5.10,$(shell uname -r)) > -PSPC_FILES := $(filter-out libcaptury.pspc,$(PSPC_FILES)) > PSPC_FILES := $(filter-out avahi.pspc,$(PSPC_FILES)) > endif > > @@ -54,6 +53,7 @@ > # perl Respect.pl --with-all --without-upload --without-build hal.pspc > # cp -p FOSShal.spec SUNWhal.spec > # sed -i -e "s/FOSShal/SUNWhal/g" SUNWhal.spec > +# sed -i -e "s/BuildConflicts:.SUNWhal//" SUNWhal.spec > # pkgtool build SUNWhal.spec > # And then as root: > # svcadm enable hal > @@ -73,7 +73,6 @@ > PSPC_FILES := $(filter-out avifile.pspc ffmpeg.pspc,$(PSPC_FILES)) > PSPC_FILES := $(filter-out openexr-viewers.pspc,$(PSPC_FILES)) > PSPC_FILES := $(filter-out portaudio.pspc,$(PSPC_FILES)) > -PSPC_FILES := $(filter-out xstuff.pspc,$(PSPC_FILES)) > > # Get just the names (without .pspc) of the resulting file list > PSPCS = $(basename $(PSPC_FILES)) > @@ -85,7 +84,13 @@ > ifeq (5.10dbus.pspc,$(shell uname -r)$(findstring > dbus.pspc,$(PSPC_FILES))) > build-qt : build-dbus > build-cups : build-dbus > +endif > > +# On S10, build xstuff before libcaptury. > +ifeq (5.10,$(shell uname -r)) > +build-libcaptury : build-xstuff > +else > +PSPC_FILES := $(filter-out xstuff.pspc,$(PSPC_FILES)) > endif > > # You can place settings in Makefile.config.local > >
ok to me too :) thanks -- Lukas 'Luc' Oboril IRC nickname: luc^ at freenode When dealing with people, let us remember we are not dealing with creatures of logic. We are dealing with creatures of emotions, creatures bristling with prejudices and motivated by pride and vanity. Dale Carnegie -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://mail.opensolaris.org/pipermail/kde-discuss/attachments/20080801/032de361/attachment.html>
