diff options
| -rw-r--r-- | misc/SlackBuild.in | 15 | ||||
| -rw-r--r-- | misc/build_rpms.sh.in | 2 | ||||
| -rw-r--r-- | misc/xine-lib.spec.in | 4 | ||||
| -rw-r--r-- | src/audio_out/Makefile.am | 21 |
4 files changed, 28 insertions, 14 deletions
diff --git a/misc/SlackBuild.in b/misc/SlackBuild.in index 5db360cda..35a0319fe 100644 --- a/misc/SlackBuild.in +++ b/misc/SlackBuild.in @@ -14,6 +14,15 @@ TMPBUILD=$CWD/tmpbuild #DOINSTDIR=/install # +# Create the post-install script +# +do_install_sh() { +cat > doinst.sh <<EOF +/sbin/ldconfig +EOF +} + +# # Create package description for pkgtool. # do_descr() { @@ -39,9 +48,11 @@ do_build() { rm -rf $TMPBUILD mkdir -p $TMPBUILD cd $TMPBUILD && tar -xzf $CWD/@TAR_NAME@.tar.gz + do_install_sh; cd @TAR_NAME@ DIE=1 ./configure --prefix=$PREFIX && make && make install-strip prefix=$PKG/$PREFIX && \ + mkdir -p $PKG/install && cp $TMPBUILD/doinst.sh $PKG/install && \ cd $PKG && \ echo "n" | makepkg $PACKAGE && \ mv $PACKAGE $SLCK && \ @@ -149,7 +160,7 @@ build_k7() { main() { rm -rf $SLCK mkdir -p $SLCK - rm -f config.cache && ./autogen.sh && make dist + rm -f config.cache && ./cvscompile.sh && make dist build_pentiumpro build_pentium build_k6 @@ -164,7 +175,7 @@ main() { build_arch() { rm -rf $SLCK mkdir -p $SLCK - rm -f config.cache && ./autogen.sh && make dist + rm -f config.cache && ./cvscompile.sh && make dist $barch mv -f $CWD/@TAR_NAME@.tar.gz $SLCK } diff --git a/misc/build_rpms.sh.in b/misc/build_rpms.sh.in index 22630b35b..065e65ce4 100644 --- a/misc/build_rpms.sh.in +++ b/misc/build_rpms.sh.in @@ -24,7 +24,7 @@ fi ##VERSION="@XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@" echo "Creating tarball..." -rm -f config.cache && ./autogen.sh && make dist +rm -f config.cache && ./cvscompile.sh && make dist mv -f @TAR_NAME@.tar.gz @PACKAGE@_@VERSION@.tar.gz rm -rf rpms mkdir rpms diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in index 20166125c..d78a335b4 100644 --- a/misc/xine-lib.spec.in +++ b/misc/xine-lib.spec.in @@ -64,8 +64,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %{prefix}/bin/xine-config -%{prefix}/man/man1/xine.* -%{prefix}/man/fr/man1/xine.* +%{prefix}/man/man3/xine-lib.* +%{prefix}/man/fr/man3/xine-lib.* %{prefix}/include/xine/*.h %{prefix}/include/xine.h %{prefix}/lib/xine/plugins/*.la diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am index 091942f9f..bf44d5940 100644 --- a/src/audio_out/Makefile.am +++ b/src/audio_out/Makefile.am @@ -1,7 +1,8 @@ CFLAGS = @GLOBAL_CFLAGS@ -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS) EXTRA_DIST = audio_alsa_out.c audio_alsa05_out.c audio_esd_out.c \ - audio_sun_out.c audio_arts_out.c #audio_irixal_out.c + audio_sun_out.c audio_arts_out.c +## audio_irixal_out.c LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic @@ -27,9 +28,9 @@ if HAVE_SUNAUDIO sun_module = xineplug_ao_out_sun.la endif -if HAVE_IRIXAL -irixal_module = xineplug_ao_out_irixal.la -endif +## if HAVE_IRIXAL +## irixal_module = xineplug_ao_out_irixal.la +## endif if HAVE_ARTS arts_module = xineplug_ao_out_arts.la @@ -42,7 +43,8 @@ endif # scheme "xineplug_ao_out_" # lib_LTLIBRARIES = $(oss_module) $(alsa_module) $(sun_module) \ - $(irixal_module) $(arts_module) $(esd_module) + $(arts_module) $(esd_module) +## $(irixal_module) xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c resample.c xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module @@ -59,16 +61,17 @@ xineplug_ao_out_esd_la_LDFLAGS = -avoid-version -module xineplug_ao_out_sun_la_SOURCES = audio_sun_out.c resample.c xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -module -xineplug_ao_out_irixal_la_SOURCES = audio_irixal_out.c resample.c -xineplug_ao_out_irixal_la_LIBADD = $(IRIXAL_LIBS) -xineplug_ao_out_irixal_la_LDFLAGS = -avoid-version -module +## xineplug_ao_out_irixal_la_SOURCES = audio_irixal_out.c resample.c +## xineplug_ao_out_irixal_la_LIBADD = $(IRIXAL_LIBS) +## xineplug_ao_out_irixal_la_LDFLAGS = -avoid-version -module xineplug_ao_out_arts_la_SOURCES = audio_arts_out.c resample.c xineplug_ao_out_arts_la_LIBADD = $(ARTS_LIBS) xineplug_ao_out_arts_la_LDFLAGS = -avoid-version -module noinst_HEADERS = audio_oss_out.h audio_alsa_out.h audio_esd_out.h \ - audio_sun_out.h audio_arts_out.h resample.h #audio_irixal_out.h + audio_sun_out.h audio_arts_out.h resample.h +## audio_irixal_out.h debug: |