[Pkg-voip-commits] r2574 - in wengophone/trunk/debian: . patches patches/generic

Marco Nenciarini mnencia at costa.debian.org
Tue Oct 17 12:17:33 UTC 2006 

Author: mnencia
Date: 2006-10-17 12:17:32 +0000 (Tue, 17 Oct 2006)
New Revision: 2574

Removed:
   wengophone/trunk/debian/patches/generic/cmake-amr-plugin-oneshot.patch
Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/get-orig-source.sh
   wengophone/trunk/debian/patches/series
Log:
New upstream (merged cmake-amr-plugin-oneshot patch)
Corrected a typo get-orig-source.sh


Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2006-10-16 20:08:38 UTC (rev 2573)
+++ wengophone/trunk/debian/changelog	2006-10-17 12:17:32 UTC (rev 2574)
@@ -1,4 +1,4 @@
-wengophone (2.0.0~rc4-svn8074-1) unstable; urgency=medium
+wengophone (2.0.0~rc4-svn8088-1) unstable; urgency=medium
 
   * New upstream snapshot.
   * Removed iLBC codec from source. (Closes: #361327)
@@ -20,7 +20,7 @@
      + cmake-amrplugin-pic-code
      + cmake-static-owcurl
 
- -- Marco Nenciarini <mnencia at debian.org>  Mon, 16 Oct 2006 18:09:38 +0200
+ -- Marco Nenciarini <mnencia at debian.org>  Tue, 17 Oct 2006 13:04:15 +0200
 
 wengophone (2.0.0~rc4-svn7960-3) unstable; urgency=low
 

Modified: wengophone/trunk/debian/get-orig-source.sh
===================================================================
--- wengophone/trunk/debian/get-orig-source.sh	2006-10-16 20:08:38 UTC (rev 2573)
+++ wengophone/trunk/debian/get-orig-source.sh	2006-10-17 12:17:32 UTC (rev 2574)
@@ -28,7 +28,7 @@
 if [ -d "$curdir/../tarballs" ]; then
     finaldir=$curdir/../tarballs
 else
-    finaldir=$(basedir $curdir)
+    finaldir=$(dirname $curdir)
 fi
 
 if [ -e "$finaldir/$desttar.gz" ]; then

Deleted: wengophone/trunk/debian/patches/generic/cmake-amr-plugin-oneshot.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-amr-plugin-oneshot.patch	2006-10-16 20:08:38 UTC (rev 2573)
+++ wengophone/trunk/debian/patches/generic/cmake-amr-plugin-oneshot.patch	2006-10-17 12:17:32 UTC (rev 2574)
@@ -1,160 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn8074/wifo/phapi/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn8074.orig/wifo/phapi/CMakeLists.txt	2006-10-16 17:26:28.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn8074/wifo/phapi/CMakeLists.txt	2006-10-16 17:26:52.000000000 +0200
-@@ -95,6 +95,28 @@
- # phapi plugins
- set(phapi_amr_plugin_SRCS
-   phcodec-amr-wrapper.c
-+  amrnb/interf_dec.c
-+  amrnb/interf_enc.c
-+  amrnb/sp_dec.c
-+  amrnb/sp_enc.c
-+  amrwb/dec_acelp.c
-+  amrwb/dec_dtx.c
-+  amrwb/dec_gain.c
-+  amrwb/dec_if.c
-+  amrwb/dec_lpc.c
-+  amrwb/dec_main.c
-+  amrwb/dec_rom.c
-+  amrwb/dec_util.c
-+  amrwb/enc_acelp.c
-+  amrwb/enc_dtx.c
-+  amrwb/enc_gain.c
-+  amrwb/enc_if.c
-+  amrwb/enc_lpc.c
-+  amrwb/enc_main.c
-+  amrwb/enc_rom.c
-+  amrwb/enc_util.c
-+  amrwb/if_rom.c
-+
- )
- 
- set(phapi_speex_plugin_SRCS
-@@ -406,9 +428,13 @@
- ### phapi plugins
- 
- # amr
-+include_directories(
-+  amrwb
-+  ambnb
-+)
- macro_add_plugin(phamrplugin ${phapi_amr_plugin_SRCS})
- macro_add_compile_flags(phamrplugin ${PHAPI_OPTIMIZATION_FLAGS})
--target_link_libraries(phamrplugin amrwb amrnb)
-+target_link_libraries(phamrplugin)
- 
- # speex
- #find_package(Speex REQUIRED)
-Index: wengophone-2.0.0~rc4-svn8074/wifo/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn8074.orig/wifo/CMakeLists.txt	2006-10-16 17:26:28.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn8074/wifo/CMakeLists.txt	2006-10-16 17:26:52.000000000 +0200
-@@ -26,8 +26,6 @@
-   netlib
-   ortp
-   phapi-util
--  phapi/amrnb
--  phapi/amrwb
-   phapi/fidlib
-   phapi/gsm
-   phapi/ilbc
-Index: wengophone-2.0.0~rc4-svn8074/wifo/phapi/amrnb/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn8074.orig/wifo/phapi/amrnb/CMakeLists.txt	2006-10-16 17:26:27.000000000 +0200
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,38 +0,0 @@
--project(amrnb)
--
--# needed include directories to build amrnb
--# saves the variable in internal cache for later use
--set(AMRNB_INCLUDE_DIRS
--  ${CMAKE_CURRENT_SOURCE_DIR}
--  CACHE INTERNAL "amrnb include directories"
--)
--
--set(AMRNB_LIBRARY
--  amrnb
--  CACHE INTERNAL "amrnb library"
--)
--
--# amrnb lib and dependencies
--set(AMRNB_LINK_LIBRARIES
--  ${AMRNB_LIBRARY}
--)
--
--set(amrnb_SRCS
--  interf_dec.c
--  interf_enc.c
--  sp_dec.c
--  sp_enc.c
--)
--
--include_directories(
--  ${AMRNB_INCLUDE_DIRS}
--)
--
--add_library(${AMRNB_LIBRARY} SHARED ${amrnb_SRCS})
--
--target_link_libraries(${AMRNB_LINK_LIBRARIES})
--
--macro_add_compile_flags(${AMRNB_LIBRARY}
--  ${PHAPI_OPTIMIZATION_FLAGS}
--)
--
-Index: wengophone-2.0.0~rc4-svn8074/wifo/phapi/amrwb/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn8074.orig/wifo/phapi/amrwb/CMakeLists.txt	2006-10-16 17:26:27.000000000 +0200
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,51 +0,0 @@
--project(amrwb)
--
--# needed include directories to build amrwb
--# saves the variable in internal cache for later use
--set(AMRWB_INCLUDE_DIRS
--  ${CMAKE_CURRENT_SOURCE_DIR}
--  CACHE INTERNAL "amrwb include directories"
--)
--
--set(AMRWB_LIBRARY
--  amrwb
--  CACHE INTERNAL "amrwb library"
--)
--
--# amrwb lib and dependencies
--set(AMRWB_LINK_LIBRARIES
--  ${AMRWB_LIBRARY}
--)
--
--set(amrwb_SRCS
--  dec_acelp.c
--  dec_dtx.c
--  dec_gain.c
--  dec_if.c
--  dec_lpc.c
--  dec_main.c
--  dec_rom.c
--  dec_util.c
--  enc_acelp.c
--  enc_dtx.c
--  enc_gain.c
--  enc_if.c
--  enc_lpc.c
--  enc_main.c
--  enc_rom.c
--  enc_util.c
--  if_rom.c
--)
--
--include_directories(
--  ${AMRWB_INCLUDE_DIRS}
--)
--
--add_library(${AMRWB_LIBRARY} SHARED ${amrwb_SRCS})
--
--target_link_libraries(${AMRWB_LINK_LIBRARIES})
--
--macro_add_compile_flags(${AMRWB_LIBRARY}
--  ${PHAPI_OPTIMIZATION_FLAGS}
--)
--

Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series	2006-10-16 20:08:38 UTC (rev 2573)
+++ wengophone/trunk/debian/patches/series	2006-10-17 12:17:32 UTC (rev 2574)
@@ -1,7 +1,6 @@
 generic/cmake-fix-static-sfp-plugin.patch
 generic/stun-fix-non-i386.patch
 generic/fix-implicit-pointer-functions.patch
-generic/cmake-amr-plugin-oneshot.patch
 generic/fix-varargs-alpha.patch
 debian/disable-crashreport.patch
 debian/cmake-svnrelease-from-debian-changelog.patch

More information about the Pkg-voip-commits mailing list