summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiggi Langauf <siggi@users.sourceforge.net>2004-09-26 21:40:46 +0000
committerSiggi Langauf <siggi@users.sourceforge.net>2004-09-26 21:40:46 +0000
commitc4fcac1273c5be824b7468edcda160c38dec1692 (patch)
tree2def9a792c3b10ba13d653f3a2a917c9d508aa84
parentc34b0e86dcc5248aae68d612642495bc136fec9c (diff)
downloadxine-lib-c4fcac1273c5be824b7468edcda160c38dec1692.tar.gz
xine-lib-c4fcac1273c5be824b7468edcda160c38dec1692.tar.bz2
update of Debian releases
CVS patchset: 7000 CVS date: 2004/09/26 21:40:46
-rw-r--r--debian/changelog24
-rwxr-xr-xdebian/rules8
2 files changed, 28 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index e7fe4516e..768341b93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+xine-lib (1-rc5-1.1) unstable; urgency=high
+
+ * Non-maintainer upload, prepared by Steve Langasek and me
+ * High-urgency upload for a sarge-targetted RC fix.
+ * Use --build, not --host, to specify the architecture; otherwise
+ autoconf thinks we're cross-compiling when we aren't.
+ * src/libffmpeg/libavcodec/sparc/dsputil_vis.c et al: make this code
+ conditional on ENABLE_VIS, since that's what that define is for;
+ fixes FTBFS on sparc when using a 32-bit target (closes: #270884).
+ * Add patch to fix overflows when handling vcd:// MRLs
+ (closes: #265061).
+
+ -- Frank Lichtenheld <djpig@debian.org> Sun, 26 Sep 2004 02:22:51 +0200
+
+xine-lib (1-rc5-1) unstable; urgency=medium
+
+ * New upstream release (closes: #258274)
+ * fixes MPEG demuxer selection (closes: #249247)
+ * suppresses warning about skipped frames on fast-fwd (closes: #255125)
+ * re-processed autogen.sh, so Debian's libtool is used (closes: #251584)
+ * passing CFLAGS explicitly to make (closes: 251103)
+
+ -- Siggi Langauf <siggi@debian.org> Sun, 11 Jul 2004 21:01:43 +0200
+
xine-lib (1-rc4a-1) unstable; urgency=high
* new upstream version
diff --git a/debian/rules b/debian/rules
index 7fae3ae20..605497d8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
BUILD_TARGET := debug
endif
-DEB_HOST_GNU_OPTION :=
+DEB_BUILD_GNU_OPTION :=
# the "optimize" flag disables compatibility hacks
ifeq (,$(findstring optimize,$(DEB_BUILD_OPTIONS)))
$(warning trying to disable machine-specific optimizations)
@@ -42,20 +42,20 @@ ifeq (,$(findstring optimize,$(DEB_BUILD_OPTIONS)))
$(shell echo $(DEB_HOST_GNU_TYPE)|sed -e 's/^i.86/i686/')
DEB_BUILD_GNU_TYPE := \
$(shell echo $(DEB_BUILD_GNU_TYPE)|sed -e 's/^i.86/i686/')
- ifneq ($DEB_HOST_GNU_TYPE,$DEB_BUILD_GNU_TYPE)
+ ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
$(warning WARNING: cross compiling is not supported by xine)
$(warning using DEB_BUILD_GNU_TYPE = $(DEB_BUILD_GNU_TYPE))
$(warning ignoring DEB_HOST_GNU_TYPE = $(DEB_HOST_GNU_TYPE))
DEB_HOST_GNU_TYPE := $(DEB_BUILD_GNU_TYPE)
endif
- DEB_HOST_GNU_OPTION := --host=$(DEB_HOST_GNU_TYPE)
+ DEB_BUILD_GNU_OPTION := --build=$(DEB_BUILD_GNU_TYPE)
endif
configure: configure-stamp
configure-stamp:
dh_testdir
./configure --prefix=/usr --mandir=\$${prefix}/share/man \
- $(DEB_HOST_GNU_OPTION)
+ $(DEB_BUILD_GNU_OPTION) CFLAGS="$(CFLAGS)"
touch configure-stamp
build: configure-stamp build-stamp