summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiggi Langauf <siggi@users.sourceforge.net>2002-11-03 23:03:30 +0000
committerSiggi Langauf <siggi@users.sourceforge.net>2002-11-03 23:03:30 +0000
commit3018a1d3fda698707e2610e2a6d11ace633fc3ca (patch)
tree04465ab47c11a637cfa0163744973f5c04cc811e
parentef9271de9fbcd4f939be54f0887441ad64a89a87 (diff)
downloadxine-lib-3018a1d3fda698707e2610e2a6d11ace633fc3ca.tar.gz
xine-lib-3018a1d3fda698707e2610e2a6d11ace633fc3ca.tar.bz2
some more release-related fixes...
CVS patchset: 3174 CVS date: 2002/11/03 23:03:30
-rw-r--r--configure.ac16
-rw-r--r--src/input/input_dvd.c7
-rw-r--r--src/libffmpeg/libavcodec/Makefile.am1
3 files changed, 11 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index cd2851df7..04642e739 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ dnl for a release tarball do "rm .cvsversion" before "make dist"
if test -f .cvsversion; then
XINE_PRE="cvs"
else
- XINE_PRE="-alpha0"
+ XINE_PRE="alpha0"
fi
AC_SUBST(XINE_MAJOR)
@@ -58,10 +58,10 @@ AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
-#TAR_NAME="xine-lib-"$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE
-#SPEC_VERSION=$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE
-TAR_NAME="xine-lib-"$XINE_MAJOR$XINE_PRE
-SPEC_VERSION=$XINE_MAJOR$XINE_PRE
+dnl TAR_NAME="xine-lib-"$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE
+dnl SPEC_VERSION=$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE
+TAR_NAME="xine-lib-"$XINE_MAJOR-$XINE_PRE
+SPEC_VERSION=${XINE_MAJOR}_$XINE_PRE
AC_SUBST(TAR_NAME)
AC_SUBST(SPEC_VERSION)
@@ -1102,10 +1102,7 @@ src/dxr3/Makefile
src/input/Makefile
src/input/libdvdnav/Makefile
src/input/libdvdread/Makefile
-src/libfaad/Makefile
-src/libfaad/codebook/Makefile
src/liba52/Makefile
-src/libdivx4/Makefile
src/libdts/Makefile
src/libffmpeg/Makefile
src/libffmpeg/libavcodec/Makefile
@@ -1116,9 +1113,7 @@ src/libffmpeg/libavcodec/alpha/Makefile
src/liblpcm/Makefile
src/libmad/Makefile
src/libmpeg2/Makefile
-src/libspucc/Makefile
src/libspudec/Makefile
-src/libsputext/Makefile
src/libvorbis/Makefile
src/libw32dll/Makefile
src/libw32dll/wine/Makefile
@@ -1126,7 +1121,6 @@ src/libw32dll/DirectShow/Makefile
src/libxinevdec/Makefile
src/libxineadec/Makefile
src/libxineadec/gsm610/Makefile
-src/libxvid/Makefile
src/video_out/Makefile
src/video_out/libdha/Makefile
src/video_out/libdha/bin/Makefile
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 84ca1aeff..fbb75e2e9 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_dvd.c,v 1.112 2002/11/02 15:13:01 mroi Exp $
+ * $Id: input_dvd.c,v 1.113 2002/11/03 23:03:31 siggi Exp $
*
*/
@@ -1676,6 +1676,9 @@ static void *init_class (xine_t *xine, void *data) {
/*
* $Log: input_dvd.c,v $
+ * Revision 1.113 2002/11/03 23:03:31 siggi
+ * some more release-related fixes...
+ *
* Revision 1.112 2002/11/02 15:13:01 mroi
* don't display crap in UI panel, xine-ui expects a xine_ui_data_t and
* I think this is right, so we provide one
@@ -1886,6 +1889,6 @@ static void *init_class (xine_t *xine, void *data) {
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_INPUT, 9, "dvd", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 9, "DVD", XINE_VERSION_CODE, NULL, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index b5bb4d7f4..b18067397 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -52,6 +52,7 @@ noinst_HEADERS = \
avcodec.h \
common.h \
dsputil.h \
+ dvdata.h \
h263data.h \
mangle.h \
mpeg4data.h \