pkg-config: major.minor.patch version

git-svn-id: svn://svn.videolan.org/x264/trunk@379 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/common/common.c b/common/common.c
index d74a28a538b840a4b6bec4d91a8d41cfe38cb2b7..423d63c3868dcd4ba06aa6dbea03adb88f4e15f3 100644 (file)
--- a/common/common.c
+++ b/common/common.c
@@ -131,6 +131,7 @@ void    x264_param_default( x264_param_t *param )
     memset( param->cqm_8iy, 16, 64 );
     memset( param->cqm_8py, 16, 64 );
 
+    param->b_repeat_headers = 1;
     param->b_aud = 0;
 }
 

diff --git a/configure b/configure
index c578b8397e159e5a659782c15fb41aea25a6ae8b..7b7e9c4f5504e786c20382ed87f2e3f3e577d4dc 100755 (executable)
--- a/configure
+++ b/configure
@@ -273,6 +273,8 @@ EOF
     echo "default: x264vfw.dll" >> config.mak
 fi
 
+./version.sh
+
 # x264.pc file creation
 rm -f x264.pc
 cat > x264.pc << EOF
@@ -283,7 +285,7 @@ includedir=$includedir
 
 Name: x264
 Description: H.264 (MPEG4 AVC) encoder library
-Version:
+Version: $(grep POINTVER < config.h | sed -e 's/.* "//; s/".*//')
 Libs: -L$libdir -lx264
 Cflags: -I$includedir
 EOF

diff --git a/version.sh b/version.sh
index 8aca7af4532f90e2fe06261a119a0c2d8d49e25f..3eb585bb95bd7f49ab0052818ba48f5c88c8cfac 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -3,6 +3,10 @@ VER=`svnversion .`
 if [ "x$VER" != x -a "$VER" != exported ]
 then
   echo "#define X264_VERSION \" svn-$VER\"" > config.h
+  API=`grep '#define X264_BUILD' < x264.h | grep -o '[1-9][0-9]*\>'`
+  VER=`echo $VER | grep -o '^[0-9]*'`
+  echo "#define X264_POINTVER \"0.$API.$VER\"" >> config.h
 else
   echo "#define X264_VERSION \"\"" > config.h
+  echo "#define X264_POINTVER \"\"" >> config.h
 fi