Merge branch 'master' of git://git.videolan.org/libdvbpsi

NEWS

 $Id$
 
+Changes between 0.2.1 and 0.2.2:
+--------------------------------
+
+  * revert regression introduced by "ignore initial discontinuity" commit (commit-id: d565a849ad0191ed14db018546c71eb52d47a741).
+  * do not use -no-undefined linkerflag on *BSD systems
+
 Changes between 0.2.0 and 0.2.1:
 --------------------------------
 

configure.ac

-AC_INIT(libdvbpsi, 0.2.1)
+AC_INIT(libdvbpsi, 0.2.2)
 
 AC_PREREQ(2.50)
 AC_CONFIG_AUX_DIR(.auto)
@@ -29,9 +29,13 @@ case "${target_os}" in
   *mingw32* | *cygwin* | *wince* | *mingwce*)
     have_win32="yes"
     ;;
+  *bsd*)
+    have_bsd="yes"
+    ;;
 esac
 AM_CONDITIONAL(HAVE_DARWIN, test "${have_darwin}" = "yes")
 AM_CONDITIONAL(HAVE_WIN32, test "${have_win32}" = "yes")
+AM_CONDITIONAL(HAVE_BSD, test "${have_bsd}" = "yes")
 
 dnl --enable-debug
 AC_ARG_ENABLE(debug,

doc/doxygen.cfg

@@ -31,7 +31,7 @@ PROJECT_NAME           = libdvbpsi
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.2.1
+PROJECT_NUMBER         = 0.2.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

src/Makefile.am

@@ -19,9 +19,13 @@ else
 if HAVE_DARWIN
 libdvbpsi_la_LDFLAGS += -no-undefined
 else
+if HAVE_BSD
+libdvbpsi_la_LDFLAGS +=
+else
 libdvbpsi_la_LDFLAGS += -Wl,--no-undefined
 endif
 endif
+endif
 
 pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h demux.h \
                      tables/pat.h tables/pmt.h tables/sdt.h tables/eit.h \

src/dvbpsi.h

@@ -33,8 +33,8 @@
 #ifndef _DVBPSI_DVBPSI_H_
 #define _DVBPSI_DVBPSI_H_
 
-#define DVBPSI_VERSION      0.2.0
-#define DVBPSI_VERSION_INT  ((0<<16)+(2<<8)+0)
+#define DVBPSI_VERSION      0.2.2
+#define DVBPSI_VERSION_INT  ((0<<16)+(2<<8)+2)
 
 #ifdef __cplusplus
 extern "C" {