From ada8ce027fc69e8a660e64849f3568c7396a84ae Mon Sep 17 00:00:00 2001
From: Thibaut Mattern <thibaut.mattern@gmail.com>
Date: Wed, 23 Jan 2008 00:41:55 +0100
Subject: Fixed pts handling, used the amount of data stored in the internal
 buffer to compensate pts.

---
 src/libmad/xine_mad_decoder.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/libmad/xine_mad_decoder.c b/src/libmad/xine_mad_decoder.c
index be616be36..46464d23b 100644
--- a/src/libmad/xine_mad_decoder.c
+++ b/src/libmad/xine_mad_decoder.c
@@ -149,6 +149,7 @@ static int head_check(mad_decoder_t *this) {
 static void mad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
   mad_decoder_t *this = (mad_decoder_t *) this_gen;
+  int bytes_in_buffer_at_pts;
 
   lprintf ("decode data, size: %d, decoder_flags: %d\n", buf->size, buf->decoder_flags);
 
@@ -170,6 +171,8 @@ static void mad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
       this->preview_mode = 1;
     }
 
+    bytes_in_buffer_at_pts = this->bytes_in_buffer;
+
     xine_fast_memcpy (&this->buffer[this->bytes_in_buffer], 
                         buf->content, buf->size);
     this->bytes_in_buffer += buf->size;
@@ -271,6 +274,8 @@ static void mad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 	  struct mad_pcm      *pcm = &this->synth.pcm;
 	  audio_buffer_t      *audio_buffer;
 	  uint16_t            *output;
+          int                  bitrate;
+          int                  pts_offset;
 
 	  audio_buffer = this->xstream->audio_out->get_buffer (this->xstream->audio_out);
 	  output = audio_buffer->mem;
@@ -291,7 +296,22 @@ static void mad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 	  }
 
 	  audio_buffer->num_frames = pcm->length;
-	  audio_buffer->vpts       = buf->pts;
+
+          /* pts computing */
+          if (this->frame.header.bitrate > 0) {
+            bitrate = this->frame.header.bitrate;
+          } else {
+            bitrate = _x_stream_info_get(this->xstream, XINE_STREAM_INFO_AUDIO_BITRATE);
+            lprintf("offset %d bps\n", bitrate);
+          }
+          audio_buffer->vpts = buf->pts;
+          if (audio_buffer->vpts && (bitrate > 0)) {
+            pts_offset = (bytes_in_buffer_at_pts * 8 * 90) / (bitrate / 1000);
+            lprintf("pts: %"PRId64", offset: %d pts, %d bytes\n", buf->pts, pts_offset, bytes_in_buffer_at_pts);
+            if (audio_buffer->vpts < pts_offset)
+              pts_offset = audio_buffer->vpts;
+            audio_buffer->vpts -= pts_offset;
+          }
 
 	  this->xstream->audio_out->put_buffer (this->xstream->audio_out, audio_buffer, this->xstream);
 
-- 
cgit v1.2.3


From 13d765ca841b06759ffcabbd606b4b01e4c1524e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 22 Jan 2008 02:29:02 +0000
Subject: Patch version missing from xine-config, libxine.pc The possible patch
 digit is missing from "xine-lib --version" and "pkg-config --modversion
 libxine", as witnessed in 1.1.9.1.

--HG--
extra : transplant_source : %3C%0E%E4%28%F3%AD%C5%7F%8F%13%D7%1Ck%10tAQ%85Oh
---
 configure.ac        | 1 +
 misc/libxine.pc.in  | 2 +-
 misc/xine-config.in | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 813c5c83a..3797f7c63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,7 @@ fi
 AC_SUBST(XINE_MAJOR)
 AC_SUBST(XINE_MINOR)
 AC_SUBST(XINE_SUB)
+AC_SUBST(XINE_PATCH)
 AC_SUBST(XINE_IFACE_AGE)
 AC_SUBST(XINE_BIN_AGE)
 
diff --git a/misc/libxine.pc.in b/misc/libxine.pc.in
index c27e8aa94..623d2b657 100644
--- a/misc/libxine.pc.in
+++ b/misc/libxine.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: libxine
 Description: The xine engine library
-Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@
+Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@
 Requires:
 Libs: -L${libdir} -lxine
 Libs.private: @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
diff --git a/misc/xine-config.in b/misc/xine-config.in
index 8d288b22b..8f25d5cc5 100644
--- a/misc/xine-config.in
+++ b/misc/xine-config.in
@@ -54,7 +54,7 @@ while test $# -gt 0; do
       echo_exec_prefix=yes
       ;;
     --version)
-      echo @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@
+      echo @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@
       ;;
     --acflags)
       echo_acflags=yes
-- 
cgit v1.2.3


From d73fc5192cf51b115695a0121629a2fe076324cb Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Tue, 22 Jan 2008 23:24:52 +0000
Subject: Add release dates to the changelog; tidy up earliest entries.
 Wherever possible, dates are from the release tarballs on Sourceforge.

--HG--
extra : transplant_source : %7C%9F%C7H%90%0C%87%D9bA%94%F8%F2%0A%7F%40%CE%5E%A0%04
---
 ChangeLog | 206 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 104 insertions(+), 102 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34cf8ddb4..b618b5099 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@ xine-lib (1.1.10) (unreleased)
     etc. without ambiguity, e.g. "#save:foo%3B1.ts" -> "foo;1.ts", but front
     end authors should be careful with xine-lib older than 1.1.10.
 
-xine-lib (1.1.9.1)
+xine-lib (1.1.9.1) 2008-01-11
   * Security fixes:
     - Buffer overflow which allows a remote attacker to execute arbitrary
       code via a crafted SDP Abstract attribute. (CVE-2008-0225)
@@ -16,7 +16,7 @@ xine-lib (1.1.9.1)
     (Only affects systems without strtok_r.) [Bug #19]
   * Fix a bug which causes video playback display errors on PPC/Darwin.
 
-xine-lib (1.1.9)
+xine-lib (1.1.9) 2008-01-06
   * Fix dvd://.../title[.chapter] handling (somewhat broken in 1.1.8).
   * Fix switching DVB subtitles channels.
   * DVB sub: switch to dyn mem alloc and allow multiple CLUTs per page.
@@ -64,7 +64,7 @@ xine-lib (1.1.9)
   * Workaround for subtitle rendering when using variable-length character
     encodings other than UTF-8. (There is probably still some breakage here.)
 
-xine-lib (1.1.8)
+xine-lib (1.1.8) 2007-08-27
   * Send a channel-changed event to the frontend when receiving the SYNC
     string from last.fm streaming server.
   * Disable mediaLib support by default (the licenses probably disallow the
@@ -90,7 +90,7 @@ xine-lib (1.1.8)
   * Various small video frame-handling bug fixes.
   * Add options to control bob deinterlacing in the XxMC video output plugin.
 
-xine-lib (1.1.7)
+xine-lib (1.1.7) 2007-06-07
   * Support libdca (new name for libdts) by shuffling around the dts.h file.
   * Add support for MDHD version 1 atom in demux_qt. [Bug SF 1679398]
   * Handle single-quoted attribute values in XML.
@@ -121,7 +121,7 @@ xine-lib (1.1.7)
     in 1.2 series.
   * Fix a colour format conversion crash in the fb video output driver.
 
-xine-lib (1.1.6)
+xine-lib (1.1.6) 2007-04-17
   * Split the DirectFB plugin into X11 and non-X versions.
   * Improve the Mac OS X video output plugin. Thanks to Matt Messier.
   * Fixed the XcbXv plugin - an empty plugin would be built if "old" Xv
@@ -133,7 +133,7 @@ xine-lib (1.1.6)
   * Fixed a CDDA-related crash and a DVD-related hang, both caused by the
     same change in 1.1.5.
 
-xine-lib (1.1.5)
+xine-lib (1.1.5) 2007-04-10
   * Security fixes:
     - Fix heap overflow in DMO loader. (CVE-2007-1246) [Bug SF 1676925]
       Thanks to Kees Cook for reporting.
@@ -187,7 +187,7 @@ xine-lib (1.1.5)
   * Support multiple audio PID in MPEG TS. Patch by Julian Scheel.
   * Improvement in portability to OpenBSD, thanks to Pascal S. de Kloe.
 
-xine-lib (1.1.4)
+xine-lib (1.1.4) 2007-01-28
   * Mark string-type configuration items according to whether they're plain
     strings or names of files, device nodes or directories. This information
     is available to front ends (via .num_value) so that they can present
@@ -253,7 +253,7 @@ xine-lib (1.1.4)
   * Fix audio/video sync problem with NTSC DVDs (introduced in 1.1.2).
     [Bugs SF 1544349, SF 1589644]
 
-xine-lib (1.1.3)
+xine-lib (1.1.3) 2006-12-03
   * Security fixes:
     - Heap overflow in libmms (related to CVE-2006-2200)
     - Buffer overrun in Real Media input plugin. [Bug SF 1603458]
@@ -298,7 +298,7 @@ xine-lib (1.1.3)
   * Fix some crashes caused by MP3 files (and possibly others) being
     misdetected as AAC.
 
-xine-lib (1.1.2)
+xine-lib (1.1.2) 2006-07-09
   * Security fixes:
     - CVE-2005-4048: possible buffer overflow in libavcodec (crafted PNGs).
     - CVE-2006-2802: possible buffer overflow in the HTTP plugin. 
@@ -334,7 +334,7 @@ xine-lib (1.1.2)
   * Fixed some win32 codec freezes when configured w32-path doesn't exist
   * Add support for RealPlayer 10 codecs (from SUSE)
   
-xine-lib (1.1.1)
+xine-lib (1.1.1) 2005-11-15
   * Improve sound quality when using alsa 1.0.9 or above.
     When playing a 44.1khz stream on a 48khz only capable sound card.
     It bypasses alsa-lib resampler and uses xine's
@@ -359,7 +359,7 @@ xine-lib (1.1.1)
   * cddb improvements/fixes (DTITLE/DYEAR parsing, timeout increase and
     multiline entries support) [Bug SF 1205274]
 
-xine-lib (1.1.0)
+xine-lib (1.1.0) 2005-07-26
   * new quality deinterlacer from dscaler: GreedyH (Greedy High Motion)
   * new quality deinterlacer from dscaler: TomsMoComp (Tom's Motion Compensated)
   * added help for most deinterlace methods
@@ -459,7 +459,7 @@ xine-lib (1.0.1)
     flexible plugin linking
   * support for Windows Media Audio Lossless
 
-xine-lib (1.0)
+xine-lib (1.0) 2004-12-25
   * unbreak DXR3 plugin
   * fix crash in the AIFF demuxer on oversized chunks
   * fix crash in the sputext decoder when subtitles have too many lines
@@ -474,7 +474,7 @@ xine-lib (1.0)
   * fixed crash related to relative HTTP redirect URLs (implemented canonicalisation)
   * linking libXv dynamically, fixes breakage of Xv plugin
 
-xine-lib (1-rc8)
+xine-lib (1-rc8) 2004-12-15
   * Multiple security vulnerabilities fixed on PNM and Real RTSP clients
   * Rewrote OpenGL output plugin.
   * Fixed segfault when seeking with the "xvmc" and "xxmc" plugins playing 
@@ -508,7 +508,7 @@ xine-lib (1-rc8)
   * meta info (title, artist, etc) returned by the xine-lib is now UTF8
   * new XINE_META_INFO_TRACK_NUMBER meta info
   
-xine-lib (1-rc7)
+xine-lib (1-rc7) 2004-11-04
   * Build system improvements: replacement functions, better work with headers
   * Set the codec name for Real Media even if we can't play the files
   * Fix win32 playback on recent versions of Linux
@@ -554,7 +554,7 @@ xine-lib (1-rc7)
   * Allowed multiple simultaneous thread access in parts of the xxmc driver, 
     assuming that XvMC libraries are thread-safe.
         
-xine-lib (1-rc6)
+xine-lib (1-rc6) 2004-09-16
   * Moved win32 frontend into separate module.
   * Fixed Xv initialization to enable multiple instances of the Xv plugin
   * Removed XInitThreads() call from some video out plugins because it
@@ -625,7 +625,7 @@ xine-lib (1-rc5)
   * fix DVD playback from a specified title/part with
     dvd:/<title>.<part> MRLs
 
-xine-lib (1-rc4a)
+xine-lib (1-rc4a) 2004-05-12
   * audio out now uses a more user friendly "Speaker arrangement" config item;
     this defaults to stereo, so if you use a different speaker arragement, like
     5.1 or other surround setups, you have to reconfigure xine using this item
@@ -641,7 +641,7 @@ xine-lib (1-rc4a)
   * several DVB improvements. add dvbs://, dvbc:// and dvbt:// mrls
   * fix static noise produced by WMA streams in some systems
 
-xine-lib (1-rc4)
+xine-lib (1-rc4) 2004-04-28
   * experimental DTS software decoder using libdts
   * SPU decoder: timestamp handling for NAV packets fixes the menu on the first
     DVD of "24" season 1
@@ -680,7 +680,7 @@ xine-lib (1-rc4)
   * seeking support for matroska files
   * libmpeg2 now has native VIS motion compensation routines on SPARC
 
-xine-lib (1-rc3c)
+xine-lib (1-rc3c) 2004-04-08
   * fix the deadlock with non-seekable input plugins
   * guess codeset for OSD if nl_langinfo(CODESET) is missing or not working
   * new option - list of domains, where don't use proxy
@@ -700,7 +700,7 @@ xine-lib (1-rc3c)
     DVD of "24" season 1
   * fixed audio sync method "resampling"
 
-xine-lib (1-rc3b)
+xine-lib (1-rc3b) 2004-03-17
   * fix SDL plugin that was broken in rc3
   * updated libfaad 2.0 RC3 cvs (fix some raw aac problems, HE support)
   * Win32 Cygwin updates, using DirectX
@@ -756,7 +756,7 @@ xine-lib (1-rc3b)
     Sound is now continuous.
   * fix playback of ogg/ogm files larger than 2GB
 
-xine-lib (1-rc3a)
+xine-lib (1-rc3a) 2003-12-28
   * new subtitle formats: jacobsub, subviewer 2.0, subrip 0.9
   * auto hiding of the subtitles
   * raw AAC file demuxer
@@ -768,7 +768,7 @@ xine-lib (1-rc3a)
   * update win32 port, working ffmpeg decode plugin
   * fixed segfault when running in verbose mode
 	
-xine-lib (1-rc3)
+xine-lib (1-rc3) 2003-12-16
   * fix dvd menu blending when using tvtime plugin (yuy2 blend)
   * fix problems with some more elaborate post plugin setups
   * discontinuity problems in audio only streams fixed
@@ -810,7 +810,7 @@ xine-lib (1-rc3)
   * fix playback of 8 bit sound when the soundcard doesn't support them
 
  
-xine-lib (1-rc2)
+xine-lib (1-rc2) 2003-10-25
   * XvMC support for hardware accelerated mpeg2 playback (-V xvmc)
   * Fix some errors in sound state when exiting xine and using alsa.
   * new tvtime/deinterlacer algorithm scalerbob
@@ -886,11 +886,11 @@ xine-lib (1-rc1)
   * initial id3v2 support (id3v2.3 and id3v2.4 are not yet supported)
   * Fix blocking on xine start when using alsa.
 
-xine-lib (1-rc0a)
+xine-lib (1-rc0a) 2003-08-02
   * includes ffmpeg's MPEG encode in dist tarball (fixes DXR3 support)
   * don't abort on MPEG_block stream errors
 
-xine-lib (1-rc0)
+xine-lib (1-rc0) 2003-08-01
   * improved seeking accuracy of ogg_demuxer 
   * xine broadcaster (send stream to multiple xine clients simultaneously)
     start master with 'xine --broadcast-port xxxx'
@@ -939,7 +939,7 @@ xine-lib (1-beta12)
   * input_pvr (ivtv) updates
   * demux_mpeg_block improved to cure problems with VCDs and bogus encrypted messages.
     
-xine-lib (1-beta11)
+xine-lib (1-beta11) 2003-04-28
   * fix bugs in selecting ogm subtitles
   * fix multiple lines subtitles' display in OGM container
   * fix fastforward bug (slow playback with unused cpu cicles)
@@ -958,7 +958,7 @@ xine-lib (1-beta11)
   * Quicktime fixes (now all Matrix: Reloaded teasers and trailers play)
   * fix playback of video files created by Canon digital cameras
 
-xine-lib (1-beta10)
+xine-lib (1-beta10) 2003-04-08
   * loading and displaying png images (e.g. for logos)
   * capability of on-the-fly stream rewiring
   * libdvdnav: PGC based positioning:
@@ -979,7 +979,7 @@ xine-lib (1-beta10)
   * DVD: menu calls ("Escape" in xine-ui) can now jump back from the
     menu into the movie as well
 	
-xine-lib (1-beta9)
+xine-lib (1-beta9) 2003-03-22
   * implement XINE_PARAM_AUDIO_AMP_LEVEL so xine's volume can be
     set independantly from other applications
   * mpeg-4 postprocessing support added to ffmpeg video decoder
@@ -1001,7 +1001,7 @@ xine-lib (1-beta9)
 xine-lib (1-beta8)
   * fix DVD highlight problems
 	
-xine-lib (1-beta7)
+xine-lib (1-beta7) 2003-03-07
   * libdvdnav updated to 0.1.6cvs: fixes a whole class of problems caused
     by dvdnav being a bit ahead in the stream due to xine's fifos
   * libdvdread updated to 0.9.4
@@ -1018,7 +1018,7 @@ xine-lib (1-beta7)
   * .rm file reference handling bugfxi
   * mute console output unless XINE_PARAM_VERBOSE is set
 	
-xine-lib (1-beta6)
+xine-lib (1-beta6) 2003-02-24
   * inform the width and height for the v4l input plugin
   * ffmpeg aspect ratio detection code fixed
   * demux_ogg arm patch by dilb
@@ -1026,7 +1026,7 @@ xine-lib (1-beta6)
   * plugin loader segfault fix
   * fb configure check fixed
 	
-xine-lib (1-beta5)
+xine-lib (1-beta5) 2003-02-21
   * new AV sync strategy (audio resample) for DXR3 users
   * improved fb driver with zero copy
   * fix the v4l plugin for lower resolution devices (webcam)
@@ -1056,13 +1056,13 @@ xine-lib (1-beta5)
   * make number of video buffer configurable by the user
     (performance tuning option)
 
-xine-lib (1-beta4)
+xine-lib (1-beta4) 2003-01-29
   * http input fixes
   * rtsp input fixes (remove long wait on end of stream)
   * build fixes
   * support for reference streams (.asx, .ram)
 
-xine-lib (1-beta3)
+xine-lib (1-beta3) 2003-01-28
   * PSX STR file demuxer
   * Westwood Studios AUD demuxer
   * PVA file demuxer
@@ -1089,14 +1089,14 @@ xine-lib (1-beta3)
   * fixed yuy2 overlays on big-endian systems
   * experimental tvout support using nvtvd (configure --enable-nvtv)
 	
-xine-lib (1-beta2)
+xine-lib (1-beta2) 2003-01-02
   * what a GOOM! post plugin
   * Digital TV (DVB) input plugin (experimental)
   * Interplay MVE playback system (file demuxer, video decoder, audio decoder)
   * support for real video 4.0 (through external real binary plugins)
   * quicktime binary-only codec support bugfixes
 	
-xine-lib (1-beta1)
+xine-lib (1-beta1) 2002-12-24
   * updated libfaad
   * improved engine for seeking and slider positioning
   * network input plugin is working again
@@ -1113,7 +1113,7 @@ xine-lib (1-beta1)
   * raw dv demuxer added
   * many FLI/FLC fixes
   
-xine-lib (1-beta0)
+xine-lib (1-beta0) 2002-12-11
   * fix decoder priority configuration
   * cache available plugins for faster xine loading
   * metronom's improvements for streams with slightly wrong sample rates
@@ -1126,7 +1126,7 @@ xine-lib (1-beta0)
   * MPEG-4 file (*.mp4) support
   * closed caption support ported to new architecture
   
-xine-lib (1-alpha2)
+xine-lib (1-alpha2) 2002-11-27
   * configurable image position
   * DVD menu button highlight position fixes
   * internal engine changes to allow a new layer of post effect plugins
@@ -1138,7 +1138,7 @@ xine-lib (1-alpha2)
   * arts audio output plugin ported to new architecture
   * esound audio output plugin ported to new architecture
 	
-xine-lib (1-alpha1) 
+xine-lib (1-alpha1) 2002-11-20
   * transport stream demuxer fixes
   * DVD playback should be working again (please report DVDs that don't play!)
   * stdin_fifo input plugin
@@ -1147,7 +1147,7 @@ xine-lib (1-alpha1)
   * XviD decoder is working again
   * DV decoder (ffmpeg)
 
-xine-lib (1-alpha0) 
+xine-lib (1-alpha0) 2002-11-04
 
   * dvd plugin replaced by dvdnav with full menu support
   * fix segfault on exit for w32codecs
@@ -1191,7 +1191,7 @@ xine-lib (1-alpha0)
   * URI conforming MRL syntax, new delimiter # for various stream parameters
   * variuos fixes for dxr3 overlay mode
 	
-xine-lib (0.9.13) unstable; urgency=low
+xine-lib (0.9.13) 2002-08-03
 
   * improved audio resampling for cards limited to 16 bits, stereo or mono
   * native wmv7 decoder using ffmpeg
@@ -1216,7 +1216,7 @@ xine-lib (0.9.13) unstable; urgency=low
 
  -- Siggi Langauf <siggi@debian.org>  Sat,  3 Aug 2002 22:44:16 +0200
 
-xine-lib (0.9.12) unstable; urgency=low
+xine-lib (0.9.12) 2002-06-23
 
   * demux_ts fixes for ATSC streams
   * configurable size of avi subtitles
@@ -1228,7 +1228,7 @@ xine-lib (0.9.12) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net>
 
-xine-lib (0.9.11) unstable; urgency=low
+xine-lib (0.9.11) 2002-06-20
   
   * sync with ffmpeg cvs
   * some endianess and 64bit machine fixes
@@ -1250,7 +1250,7 @@ xine-lib (0.9.11) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net>
  
-xine (0.9.10) unstable; urgency=low
+xine (0.9.10) 2002-05-28
 
   * fixed snapshot: capture current frame with overlays
   * AVI progressive index reconstruction
@@ -1271,7 +1271,7 @@ xine (0.9.10) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net> 
 
-xine (0.9.9) unstable; urgency=low
+xine (0.9.9) 2002-05-28
   
   * new (fast) demuxer seeking
   * libdivx4 updated to support divx5
@@ -1297,7 +1297,7 @@ xine (0.9.9) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net> Sat Apr 20 20:32:33 CEST 2002
 
-xine (0.9.8) unstable; urgency=low
+xine (0.9.8) 2002-01-16
 
   * Linux framebuffer video out driver (experimental)
   * several bugfixes
@@ -1314,7 +1314,7 @@ xine (0.9.8) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net> Sun Jan 13 16:15:07 CET 2002
 
-xine (0.9.7) unstable; urgency=low
+xine (0.9.7) 2001-12-11
 
   * fix some win32 dll segfaults
   * seamless branching on input_dvd
@@ -1326,7 +1326,7 @@ xine (0.9.7) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net> Tue Nov 27 01:20:06 CET 2001
 
-xine (0.9.6) unstable; urgency=low
+xine (0.9.6) 2001-11-28
 
   * demux_asf big fragments handling
   * working setup dialog (experimental)
@@ -1338,7 +1338,7 @@ xine (0.9.6) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net> Tue Nov 27 01:20:06 CET 2001
 
-xine (0.9.5) unstable; urgency=low
+xine (0.9.5) 2001-11-23
 
   * improved responsiveness (pause, stop, resume, seek)
   * catch segfaults when loading plugins
@@ -1357,7 +1357,7 @@ xine (0.9.5) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net> Fri Nov 23 14:10:26 CET 2001
 
-xine (0.9.4) unstable; urgency=low
+xine (0.9.4) 2001-11-04
 
   * new SyncFB video out plugin (see README.syncfb)
   * catch SIGSEGV during libdivxdecore version probing. see README.divx4.
@@ -1365,7 +1365,7 @@ xine (0.9.4) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net> Sun Nov  4 23:43:55 CET 2001
 
-xine (0.9.3) unstable; urgency=low
+xine (0.9.3) 2001-11-02
 
   * XShm gamma adjusting (brightness)
   * bugfix: lot skipped frames and low cpu
@@ -1384,7 +1384,7 @@ xine (0.9.3) unstable; urgency=low
   * dxr3 still-menu/audio sync fixes / menu buttons now auto-display
   * dxr3 now keeps BCS values in .xinerc / Aspect ratio autodetection
   
-xine (0.9.2) unstable; urgency=low
+xine (0.9.2) 2001-10-16
 
   * bugfixes
   * ogg/vorbis support
@@ -1398,7 +1398,7 @@ xine (0.9.2) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net> Sun Oct 14 20:13:20 CEST 2001
 
-xine (0.9.1) unstable; urgency=low
+xine (0.9.1) 2001-09-17
 
   * support for subtitle names
   * new software deinterlacer (try --deinterlace; caution: CPU intensive!)
@@ -1408,7 +1408,7 @@ xine (0.9.1) unstable; urgency=low
 
  -- Siggi Langauf <siggi@debian.org>  Tue, 18 Sep 2001 01:48:38 +0200
 
-xine (0.9.0) unstable; urgency=low
+xine (0.9.0) 2001-09-13
 
   * generic menu support
   * many bugfixes
@@ -1417,13 +1417,13 @@ xine (0.9.0) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net>  Fri Sep 14 01:37:31 CEST 2001
 
-xine (0.5.3) unstable; urgency=low
+xine (0.5.3) 2001-09-05
 
   * small bugfix release
 
  -- Guenter Bartsch <guenter@users.sourceforge.net>  Wed Sep  5 02:41:11 CEST 2001
 
-xine (0.5.2) unstable; urgency=low
+xine (0.5.2) 2001-09-03
 
   * many bugfixes
   * ffmpeg (mpeg4, opendivx ...) works on bigendian machines now
@@ -1435,14 +1435,14 @@ xine (0.5.2) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net>  Sun Sep  2 23:47:00 CEST 2001
 
-xine (0.5.1) unstable; urgency=low
+xine (0.5.1) 2001-08-10
 
   * ffmpeg plugin (OpenDivX, MS mpeg 4, motion-jpeg support)
   * various bugfixes
 
  -- Guenter Bartsch <guenter@users.sourceforge.net>  Sat,  11 Aug 2001 01:39:12 +0200
 
-xine (0.5.0) unstable; urgency=low
+xine (0.5.0) 2001-08-05
 
   This is the big, long-awaited architecture change
 
@@ -1459,7 +1459,7 @@ xine (0.5.0) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net>  Sun,  22 Jul 2001 13:10:52 +0200
 
-xine (0.4.3) unstable; urgency=low
+xine (0.4.3) 2001-05-16
 
   This is a minor bugfix release
 
@@ -1472,7 +1472,7 @@ xine (0.4.3) unstable; urgency=low
 
  -- Guenter Bartsch <guenter@users.sourceforge.net>  Sun,  16 May 2001 22:59:00 +0200
 
-xine (0.4.2) unstable; urgency=low
+xine (0.4.2) 2001-05-06
 
   This is mainly a bugfix release for those who want a stable xine _now_,
   before the new, better, universal 0.5 architecture has stabilized.
@@ -1490,7 +1490,7 @@ xine (0.4.2) unstable; urgency=low
   
  -- Siggi Langauf <siggi@debian.org>  Sun,  6 May 2001 14:24:01 +0200
 
-xine (0.4.0) unstable; urgency=low
+xine (0.4.0) 2001-03-02
 
   * new multithreaded architecture - xine becomes idle
   * notable performance improvements
@@ -1502,7 +1502,7 @@ xine (0.4.0) unstable; urgency=low
 
  -- Siggi Langauf <siggi@debian.org>  Sat,  3 Mar 2001 01:36:39 +0100
 
-xine (0.3.7) unstable; urgency=low
+xine (0.3.7) 2001-02-04
 
   * subpicture/subtitle support
   * experimental AC3 digital output with some ALSA drivers 
@@ -1512,7 +1512,7 @@ xine (0.3.7) unstable; urgency=low
 
  -- Siggi Langauf <siggi@debian.org>  Sun,  4 Feb 2001 14:44:23 +0100
 
-xine (0.3.6) unstable; urgency=low
+xine (0.3.6) 2001-01-22
 
   * support for field pictures
   * added autoprobing for audio driver
@@ -1526,7 +1526,7 @@ xine (0.3.6) unstable; urgency=low
 
  -- Siggi Langauf <siggi@debian.org>  Mon, 22 Jan 2001 02:06:08 +0100
 
-xine (0.3.5) unstable; urgency=low
+xine (0.3.5) 2001-01-10
 
   * (hopefully) fixed autoconf for Athlon processors
   * fixed aspect ratio calculation (=> SVCD support)
@@ -1539,7 +1539,7 @@ xine (0.3.5) unstable; urgency=low
 
  -- Siggi Langauf <siggi@users.sourceforge.net>  Wed, 10 Jan 2001 11:10:57 +0100
 
-xine (0.3.4) unstable; urgency=low
+xine (0.3.4) 2001-01-08
 
   * re-debianized package using debhelper (much cleaner debian packages)
 
@@ -1550,8 +1550,7 @@ xine (0.3.4) unstable; urgency=low
 
  -- Siggi Langauf <siggi@users.sourceforge.net>  Mon,  8 Jan 2001 04:03:11 +0100
 
-
-xine (0.3.3) unstable; urgency=low
+xine (0.3.3) 2001-01-04
 
   * playlist, autoplay function
   * seamless branching
@@ -1562,8 +1561,7 @@ xine (0.3.3) unstable; urgency=low
 
  -- Siggi Langauf <siggi@users.sourceforge.net>  Thu, 04 Jan 2001 01:37:42 +0100
 
-
-xine (0.3.2) unstable; urgency=low
+xine (0.3.2) 2000-12-13
   
   * audio rate up/downsampling
   * new yuv2rgb routines
@@ -1577,16 +1575,14 @@ xine (0.3.2) unstable; urgency=low
 
    -- Siggi Langauf <siggi@users.sourceforge.net>  Wed, 13 Dec 2000 02:44:18 +0100
 
-
-xine (0.3.1p1) unstable; urgency=high
+xine (0.3.1p1) 2000-11-21
 
   * Bugfix for Debian package: 0.3.1 always segfaulted. This release should
     work... 
 
  -- Siggi Langauf <siggi@users.sourceforge.net>  Tue, 21 Nov 2000 21:43:18 +0100
 
-
-xine (0.3.1) unstable; urgency=low
+xine (0.3.1) 2000-11-20
 
   * Initial release of Debian package.
 
@@ -1598,36 +1594,42 @@ xine (0.3.1) unstable; urgency=low
 
  -- Siggi Langauf <siggi@users.sourceforge.net>  Sun, 19 Nov 2000 15:33:28 +0100
 
-xine (0.3.0+older) unstable; urgency=low
-  
-  0.3.0
-        - NULL audio driver (ability to run without sound card) 
-        - ALSA audio driver
-	- pause function
-	- simple playlist function
-	- massive performance improvements for xshm
- 	  through subslice output
-	- gui/skin improvements
-	- improved build process
-	- improved internal architecture
-	- many minor updates/bugfixes
-
-  0.2.4
-	this is a maintenance/bugfix
-	release, just wanted to release all the small little changes
-	before we go for the next big architecture update that will
-	be in the 0.3.x series
-
-	
-  0.2.3
-	- included patches by Alan Cox:
-	  net_plugin, bug fixes (i.e. VCD ...)
-	- xshm video output module fixed for bpp>16
-	  (but don't use that for speed reasons!)
-	- new iDCT_mmx code from walken 
-	  => picture quality massively improved :))
-	- FAQ update
-	- speed improvements due to new compiler switches
-	- minor Makefile fixes for FreeBSD ports 
+xine (0.3.0) 2000-11-18
+
+  - NULL audio driver (ability to run without sound card) 
+  - ALSA audio driver
+  - pause function
+  - simple playlist function
+  - massive performance improvements for xshm through subslice output
+  - gui/skin improvements
+  - improved build process
+  - improved internal architecture
+  - many minor updates/bugfixes
+
+xine (0.2.4) 2000-10-30
+
+  - this is a maintenance/bugfix release, just wanted to release all the
+    small little changes before we go for the next big architecture update
+    that will be in the 0.3.x series
+
+xine (0.2.3) 2000-10-15
+
+  - included patches by Alan Cox:
+    net_plugin, bug fixes (i.e. VCD ...)
+  - xshm video output module fixed for bpp>16
+    (but don't use that for speed reasons!)
+  - new iDCT_mmx code from walken 
+    => picture quality massively improved :))
+  - FAQ update
+  - speed improvements due to new compiler switches
+  - minor Makefile fixes for FreeBSD ports 
   
  -- Siggi Langauf <siggi@users.sourceforge.net>  Sun,  7 Jan 2001 23:59:12 +0100
+
+xine (0.2.2) 2000-10-10
+
+xine (0.2.1) 2000-10-10
+
+xine (0.2.0) 2000-09-28
+
+xine (0.1.3) 2000-08-17
-- 
cgit v1.2.3


From 87d72726273d21a3e61b68968c0be68762dc1ccb Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Wed, 23 Jan 2008 00:37:33 +0000
Subject: Finish the backport of libxine.pc.in; do xine-config (now requires
 pkg-config). Remove the "deprecated" warnings since xine-config is not
 deprecated in 1.1.x. --skindir no longer works.

--HG--
rename : misc/xine-config.in => misc/xine-config
---
 ChangeLog                |   2 +
 configure.ac             |  18 ++++---
 debian/control           |   2 +-
 doc/man/en/xine-config.1 |   3 --
 misc/libxine.pc.in       |  12 +++++
 misc/xine-config         |  69 ++++++++++++++++++++++++++
 misc/xine-config.in      | 123 -----------------------------------------------
 7 files changed, 95 insertions(+), 134 deletions(-)
 create mode 100644 misc/xine-config
 delete mode 100644 misc/xine-config.in

diff --git a/ChangeLog b/ChangeLog
index b618b5099..104778708 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ xine-lib (1.1.10) (unreleased)
   * Unescape the filename in "#save:". This allows filenames to contain ';'
     etc. without ambiguity, e.g. "#save:foo%3B1.ts" -> "foo;1.ts", but front
     end authors should be careful with xine-lib older than 1.1.10.
+  * Backported xine-config & libxine.pc from 1.2.
+    Consequently, xine-config now requires pkg-config.
 
 xine-lib (1.1.9.1) 2008-01-11
   * Security fixes:
diff --git a/configure.ac b/configure.ac
index 3797f7c63..884d64e8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2392,9 +2392,14 @@ makeexpand () {
   echo "$i"
 }
 
-XINE_PLUGINDIR="$libdir/xine/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PATCH"
-XINE_FONTDIR="${datadir}/xine/libxine$XINE_MAJOR/fonts"
-XINE_LOCALEDIR="${datadir}/locale"
+xinelibdir='${libdir}/xine'
+xinedatadir='${datadir}/xine'
+AC_SUBST(xinelibdir)
+AC_SUBST(xinedatadir)
+
+XINE_PLUGINDIR="\${xinelibdir}/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PATCH"
+XINE_FONTDIR="\${xinedatadir}/xine/libxine$XINE_MAJOR/fonts"
+XINE_LOCALEDIR='${datadir}/locale'
 XINE_REL_PLUGINDIR="`makeexpand "$XINE_PLUGINDIR"`"
 XINE_REL_PLUGINDIR="`makeexpand "$XINE_REL_PLUGINDIR" | sed -e "s,^${prefix}/,,"`"
 XINE_REL_FONTDIR="`makeexpand "$XINE_FONTDIR" | sed -e "s,^${prefix}/,,"`"
@@ -2438,16 +2443,16 @@ AC_SUBST(XINE_FONTDIR)
 AC_SUBST(XINE_LOCALEDIR)
 
 dnl Where aclocal m4 files should be installed
-XINE_ACFLAGS="-I `makeexpand "${datarootdir}/aclocal"`"
+XINE_ACFLAGS="-I ${datarootdir}/aclocal"
 AC_DEFINE_UNQUOTED(XINE_ACFLAGS, "$XINE_ACFLAGS", [Path where aclocal m4 files will be.])
 AC_SUBST(XINE_ACFLAGS)
 
 dnl Where architecture independent data (e.g. logo) will/should be installed
-XINE_DATADIR="`makeexpand "${datarootdir}/xine"`"
+XINE_DATADIR="\${xinedatadir}"
 AC_SUBST(XINE_DATADIR)
 
 dnl Where scripts will/should be installed.
-eval XINE_SCRIPTPATH="$XINE_DATADIR/xine/scripts"
+XINE_SCRIPTPATH="\${xinedatadir}/scripts"
 AC_SUBST(XINE_SCRIPTPATH)
 
 
@@ -2651,7 +2656,6 @@ misc/build_rpms.sh
 misc/fonts/Makefile
 misc/libxine.pc
 misc/relchk.sh
-misc/xine-config
 misc/xine-lib.spec
 po/Makefile.in
 src/Makefile
diff --git a/debian/control b/debian/control
index de1467cc5..a1faae54c 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Standards-Version: 3.7.2
 Package: libxine-dev
 Architecture: any
 Section: libdevel
-Depends: libxine1 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev
+Depends: libxine1 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev, pkg-config
 Conflicts: xine-ui (<< 0.9.10), libxine2-dev
 Description: the xine video player library, development packages
  This contains development files (headers, documentation and the like)
diff --git a/doc/man/en/xine-config.1 b/doc/man/en/xine-config.1
index 0a2d8bcc6..accde1088 100644
--- a/doc/man/en/xine-config.1
+++ b/doc/man/en/xine-config.1
@@ -30,9 +30,6 @@ Print the compiler flags that are necessary to compile a program that uses
 .B  \-\-plugindir
 Print the directory where \fIlibxine\fP plugins are stored/expected.
 .TP 8
-.B  \-\-skindir
-Print the directory in which \fIlibxine\fP skins are stored/expected.
-.TP 8
 .B  \-\-prefix=PREFIX
 If specified, use PREFIX instead of the installation prefix that \fIxine-lib\fP
 was built with when computing the output for the \-\-cflags and
diff --git a/misc/libxine.pc.in b/misc/libxine.pc.in
index 623d2b657..a6565bad0 100644
--- a/misc/libxine.pc.in
+++ b/misc/libxine.pc.in
@@ -3,6 +3,18 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
+datarootdir=@datarootdir@
+datadir=@datadir@
+
+xinelibdir=@xinelibdir@
+xinedatadir=@xinedatadir@
+
+acflags=@XINE_ACFLAGS@
+plugindir=@XINE_PLUGINDIR@
+scriptdir=@XINE_SCRIPTPATH@
+localedir=@XINE_LOCALEDIR@
+objcflags=@OBJCFLAGS@
+
 Name: libxine
 Description: The xine engine library
 Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@
diff --git a/misc/xine-config b/misc/xine-config
new file mode 100644
index 000000000..f5993f471
--- /dev/null
+++ b/misc/xine-config
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+#
+
+unset prefix
+unset exec_prefix
+unset args
+
+usage()
+{
+	cat <<EOF
+Usage: xine-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--version]
+        [--libs]
+	[--acflags]
+	[--cflags]
+	[--plugindir]
+	[--datadir]
+	[--scriptdir]
+	[--localedir]
+	[--objcflags]
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg="${1#--*=}" ;;
+  *) optarg= ;;
+  esac
+
+  case "$1" in
+    --prefix=*)
+      prefix="$optarg"
+      if [ "$exec_prefix" = '' ]; then
+        exec_prefix="$optarg"
+      fi
+      ;;
+    --exec-prefix=*)
+      exec_prefix="$optarg"
+      ;;
+    --prefix|--exec-prefix)
+      ;;
+    --version)
+      args="$args${args+ }--modversion"
+      ;;
+    --cflags|--libs)
+      args="$args${args+ }$1"
+      ;;
+    --acflags|--plugindir|--datadir|--scriptdir|--localedir|--objcflags)
+      args="$args${args+ }--variable=${1#--}"
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+exec pkg-config "${prefix+--define-variable=prefix=}$prefix" \
+		"${exec_prefix+--define-variable=exc_prefix=}$exec_prefix" \
+		$args libxine
diff --git a/misc/xine-config.in b/misc/xine-config.in
deleted file mode 100644
index 8f25d5cc5..000000000
--- a/misc/xine-config.in
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-#
-#
-
-prefix=@XINE_CONFIG_PREFIX@
-exec_prefix=@exec_prefix@
-exec_prefix_set=no
-
-usage()
-{
-	cat <<EOF
-Usage: xine-config [OPTIONS] [LIBRARIES]
-Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
-	[--version]
-        [--libs]
-	[--acflags]
-	[--cflags]
-	[--plugindir]
-	[--datadir]
-	[--scriptdir]
-	[--localedir]
-	[--objcflags]
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      if test $exec_prefix_set = no ; then
-        exec_prefix=$optarg
-      fi
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      exec_prefix_set=yes
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --version)
-      echo @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@
-      ;;
-    --acflags)
-      echo_acflags=yes
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    --plugindir)
-      echo_plugindir=yes
-      ;;
-    --datadir)
-      echo_datadir=yes
-      ;;
-    --scriptdir)
-      echo_scriptdir=yes
-      ;;
-    --localedir)
-      echo_localedir=yes
-      ;;
-    --objcflags)
-      echo_objcflags=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-
-if test "$echo_prefix" = "yes"; then
-	echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
-	echo $exec_prefix
-fi
-
-if test "$echo_acflags" = "yes"; then
-      echo "@XINE_ACFLAGS@"
-fi
-
-if test "$echo_cflags" = "yes"; then
-      echo -I@includedir@ @PTHREAD_CFLAGS@
-fi
-
-if test "$echo_libs" = "yes"; then
-      echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
-fi      
-if test "$echo_plugindir" = "yes"; then
-      echo "@XINE_PLUGINPATH@"
-fi      
-if test "$echo_datadir" = "yes"; then
-      echo "@XINE_DATADIR@"
-fi      
-if test "$echo_scriptdir" = "yes"; then
-      echo "@XINE_SCRIPTPATH@"
-fi
-if test "$echo_localedir" = "yes"; then
-      echo "@XINE_LOCALEPATH@"
-fi
-if test "$echo_objcflags" = "yes"; then
-      echo "@OBJCFLAGS@"
-fi
-- 
cgit v1.2.3


From a5203938aa08ae901dc0383848afe13272d345d6 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Wed, 23 Jan 2008 00:45:13 +0000
Subject: Fix xine-config bugs related to --prefix & --exec-prefix. Output the
 values, and correctly set exec_prefix.

---
 misc/xine-config | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/misc/xine-config b/misc/xine-config
index f5993f471..3e67e5dc7 100644
--- a/misc/xine-config
+++ b/misc/xine-config
@@ -42,11 +42,11 @@ while test $# -gt 0; do
       if [ "$exec_prefix" = '' ]; then
         exec_prefix="$optarg"
       fi
+      args="$args${args+ }--variable=prefix"
       ;;
     --exec-prefix=*)
       exec_prefix="$optarg"
-      ;;
-    --prefix|--exec-prefix)
+      args="$args${args+ }--variable=exec_prefix"
       ;;
     --version)
       args="$args${args+ }--modversion"
@@ -54,9 +54,12 @@ while test $# -gt 0; do
     --cflags|--libs)
       args="$args${args+ }$1"
       ;;
-    --acflags|--plugindir|--datadir|--scriptdir|--localedir|--objcflags)
+    --prefix|--acflags|--plugindir|--datadir|--scriptdir|--localedir|--objcflags)
       args="$args${args+ }--variable=${1#--}"
       ;;
+    --exec-prefix)
+      args="$args${args+ }--variable=exec_prefix"
+      ;;
     *)
       usage 1 1>&2
       ;;
@@ -65,5 +68,5 @@ while test $# -gt 0; do
 done
 
 exec pkg-config "${prefix+--define-variable=prefix=}$prefix" \
-		"${exec_prefix+--define-variable=exc_prefix=}$exec_prefix" \
+		"${exec_prefix+--define-variable=exec_prefix=}$exec_prefix" \
 		$args libxine
-- 
cgit v1.2.3