Menu
▾
▴
[xine-cvs] CVS: xine-lib/misc SlackBuild.in,1.5,1.6 build_rpms.sh.in,1.5,1.6 xine-lib.spec.in,1.28,1.29
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-01-20 12:33:48
|
Update of /cvsroot/xine/xine-lib/misc
In directory usw-pr-cvs1:/tmp/cvs-serv29068/misc
Modified Files:
SlackBuild.in build_rpms.sh.in xine-lib.spec.in
Log Message:
alsa 05 support: terminated.
Index: SlackBuild.in
===================================================================
RCS file: /cvsroot/xine/xine-lib/misc/SlackBuild.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SlackBuild.in 2001/10/14 14:17:29 1.5
+++ SlackBuild.in 2002/01/20 12:33:45 1.6
@@ -8,7 +8,6 @@
CWD=`pwd`
PACKAGE=@PACKAGE@.tgz
@HAVE_OSS_TRUE@ossPACKAGE=@PACKAGE@-oss.tgz
-@HAVE_ALSA05_TRUE@alsa05PACKAGE=@PACKAGE@-alsa05.tgz
@HAVE_ALSA09_TRUE@alsa09PACKAGE=@PACKAGE@-alsa09.tgz
@HAVE_DXR3_TRUE@dxr3PACKAGE=@PACKAGE@-dxr3.tgz
@HAVE_ARTS_TRUE@artsPACKAGE=@PACKAGE@-arts.tgz
@@ -55,12 +54,6 @@
@HAVE_OSS_TRUE@@PACKAGE@-oss: audio plugin with oss support.
@HAVE_OSS_TRUE@EOF
-@HAVE_ALSA05_TRUE@cat > package_descriptions_alsa05 << EOF
-@HAVE_ALSA05_TRUE@@PACKAGE@-alsa05: @PACKAGE@-alsa05 @SPEC_VERSION@.
-@HAVE_ALSA05_TRUE@@PACKAGE@-alsa05:
-@HAVE_ALSA05_TRUE@@PACKAGE@-alsa05: audio plugin with alsa 0.5.x support.
-@HAVE_ALSA05_TRUE@EOF
-
@HAVE_ALSA09_TRUE@cat > package_descriptions_alsa09 << EOF
@HAVE_ALSA09_TRUE@@PACKAGE@-alsa09: @PACKAGE@-alsa09 @SPEC_VERSION@.
@HAVE_ALSA09_TRUE@@PACKAGE@-alsa09:
@@ -111,7 +104,7 @@
}
#
-# Create extra packages (alsa05, alsa09 and dxr3, etc...)
+# Create extra packages (alsa09 and dxr3, etc...)
#
do_extra_packages() {
cwd=`pwd`
@@ -125,15 +118,6 @@
@HAVE_OSS_TRUE@ rm -rf oss && \
@HAVE_OSS_TRUE@ rm -f $PKG/$PREFIX/lib/xine/plugins/xineplug_ao_out_oss.la $PKG/$PREFIX/lib/xine/plugins/xineplug_ao_out_oss.so
-## Alsa 0.5 plugin
-@HAVE_ALSA05_TRUE@ mkdir -p alsa05$PREFIX/lib/xine/plugins && \
-@HAVE_ALSA05_TRUE@ cp $PKG/$PREFIX/lib/xine/plugins/xineplug_ao_out_alsa05.la $PKG/$PREFIX/lib/xine/plugins/xineplug_ao_out_alsa05.so alsa05$PREFIX/lib/xine/plugins && \
-@HAVE_ALSA05_TRUE@ (cd alsa05 && \
-@HAVE_ALSA05_TRUE@ echo "n" | makepkg $alsa05PACKAGE && \
-@HAVE_ALSA05_TRUE@ echo "move $alsa05PACKAGE to $SLCK" && mv $alsa05PACKAGE $SLCK) && \
-@HAVE_ALSA05_TRUE@ rm -rf alsa05 && \
-@HAVE_ALSA05_TRUE@ rm -f $PKG/$PREFIX/lib/xine/plugins/xineplug_ao_out_alsa05.la $PKG/$PREFIX/lib/xine/plugins/xineplug_ao_out_alsa05.so
-
## Alsa 0.9 plugin
@HAVE_ALSA09_TRUE@ mkdir -p alsa09$PREFIX/lib/xine/plugins && \
@HAVE_ALSA09_TRUE@ cp $PKG/$PREFIX/lib/xine/plugins/xineplug_ao_out_alsa.la $PKG/$PREFIX/lib/xine/plugins/xineplug_ao_out_alsa.so alsa09$PREFIX/lib/xine/plugins && \
@@ -237,7 +221,6 @@
rm -rf $TMPBUILD
rm -f $PACKAGE package_descriptions
@HAVE_OSS_TRUE@ rm -f $ossPACKAGE
-@HAVE_ALSA05_TRUE@ rm -f $alsa05PACKAGE
@HAVE_ALSA09_TRUE@ rm -f $alsa09PACKAGE
@HAVE_DXR3_TRUE@ rm -f $dxr3PACKAGE
@HAVE_ARTS_TRUE@ rm -f $artsPACKAGE
@@ -270,9 +253,6 @@
@HAVE_OSS_TRUE@ rm -f package_descriptions
@HAVE_OSS_TRUE@ mv package_descriptions_oss package_descriptions && \
@HAVE_OSS_TRUE@ tar -czvf @PACKAGE@-@VERSION@-oss-i686.tar.gz $ossPACKAGE package_descriptions
-@HAVE_ALSA05_TRUE@ rm -f package_descriptions
-@HAVE_ALSA05_TRUE@ mv package_descriptions_alsa05 package_descriptions && \
-@HAVE_ALSA05_TRUE@ tar -czvf @PACKAGE@-@VERSION@-alsa05-i686.tar.gz $alsa05PACKAGE package_descriptions
@HAVE_ALSA09_TRUE@ rm -f package_descriptions
@HAVE_ALSA09_TRUE@ mv package_descriptions_alsa09 package_descriptions && \
@HAVE_ALSA09_TRUE@ tar -czvf @PACKAGE@-@VERSION@-alsa09-i686.tar.gz $alsa09PACKAGE package_descriptions
@@ -322,9 +302,6 @@
@HAVE_OSS_TRUE@ rm -f package_descriptions
@HAVE_OSS_TRUE@ mv package_descriptions_oss package_descriptions && \
@HAVE_OSS_TRUE@ tar -czvf @PACKAGE@-@VERSION@-oss-i586.tar.gz $ossPACKAGE package_descriptions
-@HAVE_ALSA05_TRUE@ rm -f package_descriptions
-@HAVE_ALSA05_TRUE@ mv package_descriptions_alsa05 package_descriptions && \
-@HAVE_ALSA05_TRUE@ tar -czvf @PACKAGE@-@VERSION@-alsa05-i586.tar.gz $alsa05PACKAGE package_descriptions
@HAVE_ALSA09_TRUE@ rm -f package_descriptions
@HAVE_ALSA09_TRUE@ mv package_descriptions_alsa09 package_descriptions && \
@HAVE_ALSA09_TRUE@ tar -czvf @PACKAGE@-@VERSION@-alsa09-i586.tar.gz $alsa09PACKAGE package_descriptions
@@ -373,9 +350,6 @@
@HAVE_OSS_TRUE@ rm -f package_descriptions
@HAVE_OSS_TRUE@ mv package_descriptions_oss package_descriptions && \
@HAVE_OSS_TRUE@ tar -czvf @PACKAGE@-@VERSION@-oss-k6.tar.gz $ossPACKAGE package_descriptions
-@HAVE_ALSA05_TRUE@ rm -f package_descriptions
-@HAVE_ALSA05_TRUE@ mv package_descriptions_alsa05 package_descriptions && \
-@HAVE_ALSA05_TRUE@ tar -czvf @PACKAGE@-@VERSION@-alsa05-k6.tar.gz $alsa05PACKAGE package_descriptions
@HAVE_ALSA09_TRUE@ rm -f package_descriptions
@HAVE_ALSA09_TRUE@ mv package_descriptions_alsa09 package_descriptions && \
@HAVE_ALSA09_TRUE@ tar -czvf @PACKAGE@-@VERSION@-alsa09-k6.tar.gz $alsa09PACKAGE package_descriptions
@@ -424,9 +398,6 @@
@HAVE_OSS_TRUE@ rm -f package_descriptions
@HAVE_OSS_TRUE@ mv package_descriptions_oss package_descriptions && \
@HAVE_OSS_TRUE@ tar -czvf @PACKAGE@-@VERSION@-oss-k7.tar.gz $ossPACKAGE package_descriptions
-@HAVE_ALSA05_TRUE@ rm -f package_descriptions
-@HAVE_ALSA05_TRUE@ mv package_descriptions_alsa05 package_descriptions && \
-@HAVE_ALSA05_TRUE@ tar -czvf @PACKAGE@-@VERSION@-alsa05-k7.tar.gz $alsa05PACKAGE package_descriptions
@HAVE_ALSA09_TRUE@ rm -f package_descriptions
@HAVE_ALSA09_TRUE@ mv package_descriptions_alsa09 package_descriptions && \
@HAVE_ALSA09_TRUE@ tar -czvf @PACKAGE@-@VERSION@-alsa09-k7.tar.gz $alsa09PACKAGE package_descriptions
Index: build_rpms.sh.in
===================================================================
RCS file: /cvsroot/xine/xine-lib/misc/build_rpms.sh.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build_rpms.sh.in 2001/10/14 13:45:49 1.5
+++ build_rpms.sh.in 2002/01/20 12:33:45 1.6
@@ -46,7 +46,6 @@
mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-@SPEC_VERSION@-0.i686.rpm'
mv -f '/usr/src/redhat/RPMS/i386/@PACKAGE@-docs-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-docs-@SPEC_VERSION@-0.rpm'
@HAVE_OSS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-oss-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-oss-@SPEC_VERSION@-0.i686.rpm'
-@HAVE_ALSA05_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa05-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa05-@SPEC_VERSION@-0.i686.rpm'
@HAVE_ALSA09_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa09-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa09-@SPEC_VERSION@-0.i686.rpm'
@HAVE_ARTS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-arts-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-arts-@SPEC_VERSION@-0.i686.rpm'
@HAVE_ESD_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-esd-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-esd-@SPEC_VERSION@-0.i686.rpm'
@@ -72,7 +71,6 @@
mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-@SPEC_VERSION@-0.k6.rpm'
mv -f '/usr/src/redhat/RPMS/i386/@PACKAGE@-docs-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-docs-@SPEC_VERSION@-0.rpm'
@HAVE_OSS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-oss-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-oss-@SPEC_VERSION@-0.k6.rpm'
-@HAVE_ALSA05_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa05-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa05-@SPEC_VERSION@-0.k6.rpm'
@HAVE_ALSA09_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa09-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa09-@SPEC_VERSION@-0.k6.rpm'
@HAVE_ARTS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-arts-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-arts-@SPEC_VERSION@-0.k6.rpm'
@HAVE_ESD_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-esd-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-esd-@SPEC_VERSION@-0.k6.rpm'
@@ -98,7 +96,6 @@
mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-@SPEC_VERSION@-0.i586.rpm'
mv -f '/usr/src/redhat/RPMS/i386/@PACKAGE@-docs-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-docs-@SPEC_VERSION@-0.rpm'
@HAVE_OSS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-oss-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-oss-@SPEC_VERSION@-0.i586.rpm'
-@HAVE_ALSA05_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa05-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa05-@SPEC_VERSION@-0.i586.rpm'
@HAVE_ALSA09_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa09-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa09-@SPEC_VERSION@-0.i586.rpm'
@HAVE_ARTS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-arts-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-arts-@SPEC_VERSION@-0.i586.rpm'
@HAVE_ESD_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-esd-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-esd-@SPEC_VERSION@-0.i586.rpm'
@@ -124,7 +121,6 @@
mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-@SPEC_VERSION@-0.k7.rpm'
mv -f '/usr/src/redhat/RPMS/i386/@PACKAGE@-docs-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-docs-@SPEC_VERSION@-0.rpm'
@HAVE_OSS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-oss-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-oss-@SPEC_VERSION@-0.k7.rpm'
-@HAVE_ALSA05_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa05-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa05-@SPEC_VERSION@-0.k7.rpm'
@HAVE_ALSA09_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa09-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa09-@SPEC_VERSION@-0.k7.rpm'
@HAVE_ARTS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-arts-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-arts-@SPEC_VERSION@-0.k7.rpm'
@HAVE_ESD_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-esd-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-esd-@SPEC_VERSION@-0.k7.rpm'
Index: xine-lib.spec.in
===================================================================
RCS file: /cvsroot/xine/xine-lib/misc/xine-lib.spec.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xine-lib.spec.in 2001/12/26 20:09:54 1.28
+++ xine-lib.spec.in 2002/01/20 12:33:45 1.29
@@ -21,11 +21,6 @@
@HAVE_OSS_TRUE@Group: Development/Libraries
@HAVE_OSS_TRUE@Requires: xine-lib >= %{ver}
-@HAVE_ALSA05_TRUE@%package alsa05
-@HAVE_ALSA05_TRUE@Summary: XINE - alsa 0.5.x support.
-@HAVE_ALSA05_TRUE@Group: Development/Libraries
-@HAVE_ALSA05_TRUE@Requires: xine-lib >= %{ver}
-
@HAVE_ALSA09_TRUE@%package alsa09
@HAVE_ALSA09_TRUE@Summary: XINE - alsa >= 0.9.x support.
@HAVE_ALSA09_TRUE@Group: Development/Libraries
@@ -109,9 +104,6 @@
@HAVE_OSS_TRUE@%description oss
@HAVE_OSS_TRUE@audio plugin with oss support.
-@HAVE_ALSA05_TRUE@%description alsa05
-@HAVE_ALSA05_TRUE@audio plugin with alsa 0.5.x support.
-
@HAVE_ALSA09_TRUE@%description alsa09
@HAVE_ALSA09_TRUE@audio plugin with alsa >= 0.9.x support.
@@ -277,11 +269,6 @@
@HAVE_OSS_TRUE@%defattr(-,root,root)
@HAVE_OSS_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_oss.la
@HAVE_OSS_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_oss.so
-
-@HAVE_ALSA05_TRUE@%files alsa05
-@HAVE_ALSA05_TRUE@%defattr(-,root,root)
-@HAVE_ALSA05_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa05.la
-@HAVE_ALSA05_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa05.so
@HAVE_ALSA09_TRUE@%files alsa09
@HAVE_ALSA09_TRUE@%defattr(-,root,root)
|