Changeset 29808


Ignore:
Timestamp:
2012-01-19T16:55:18+01:00 (6 years ago)
Author:
jow
Message:

[packages] libsrtp:

  • move srtp to libsrtp, rename package from srtp to libsrtp
  • use CONIGURE_ARGS instead of overriding Build/Configure
  • use PKG_INSTALL instead of overriding Build/Compile
  • refresh patches
Location:
packages/libs
Files:
2 added
1 deleted
5 moved

Legend:

Unmodified
Added
Removed
  • packages/libs/libsrtp/Makefile

    r29807 r29808  
    11#  
    2 # Copyright (C) 2011 OpenWrt.org 
     2# Copyright (C) 2011-2012 OpenWrt.org 
    33# Copyright (C) 2011 Victor Seva <linuxmaniac@torreviejawireless.org> 
    44# 
     
    88include $(TOPDIR)/rules.mk 
    99 
    10 PKG_NAME:=srtp 
     10PKG_NAME:=libsrtp 
    1111PKG_VERSION:=1.4.4 
    1212PKG_RELEASE:=1 
    1313 
    14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz 
     14PKG_SOURCE:=srtp-$(PKG_VERSION).tgz 
    1515PKG_SOURCE_URL:=@SF/srtp 
    1616PKG_MD5SUM:=9b449edb011c934ca97009e7e0566d22 
    17 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
     17 
     18PKG_BUILD_DIR:=$(BUILD_DIR)/srtp 
     19PKG_INSTALL:=1 
    1820 
    1921include $(INCLUDE_DIR)/package.mk 
    2022 
    2123TARGET_CFLAGS += $(FPIC) 
     24CONFIGURE_ARGS += --disable-stdout --enable-syslog 
    2225 
    2326define Package/libsrtp 
     
    3336        Protocol (SRTP) originally authored by Cisco Systems, Inc. 
    3437        It is available under a BSD-style license. 
    35 endef 
    36  
    37 define Build/Configure 
    38         $(call Build/Configure/Default, \ 
    39                 --disable-stdout \ 
    40                 --enable-syslog \ 
    41         ) 
    42 endef 
    43  
    44 define Build/Compile 
    45         $(MAKE) -C $(PKG_BUILD_DIR) \ 
    46                 DESTDIR="$(PKG_INSTALL_DIR)" all install 
    4738endef 
    4839 
  • packages/libs/libsrtp/patches/1003_fix_mips_namespace_collision.patch

    r29807 r29808  
    66--- a/test/srtp_driver.c 
    77+++ b/test/srtp_driver.c 
    8 @@ -338,7 +338,7 @@ 
     8@@ -314,7 +314,7 @@ main (int argc, char *argv[]) { 
    99   if (do_codec_timing) { 
    1010     srtp_policy_t policy; 
     
    1515     crypto_policy_set_rtp_default(&policy.rtp); 
    1616     crypto_policy_set_rtcp_default(&policy.rtcp); 
    17 @@ -350,33 +350,33 @@ 
    18      policy.allow_repeat_tx = 0; 
     17@@ -323,33 +323,33 @@ main (int argc, char *argv[]) { 
     18     policy.key  = test_key; 
    1919     policy.next = NULL; 
    2020  
  • packages/libs/libsrtp/patches/1005_fix_data_alignment.patch

    r29807 r29808  
    77--- a/test/srtp_driver.c 
    88+++ b/test/srtp_driver.c 
    9 @@ -1195,7 +1195,6 @@ 
     9@@ -1129,7 +1129,6 @@ mips_estimate(int num_trials, int *ignor 
    1010  * These packets were made with the default SRTP policy. 
    1111  */ 
     
    1414 err_status_t 
    1515 srtp_validate() { 
    16    uint8_t srtp_plaintext_ref[28] = { 
    17 @@ -1204,14 +1203,14 @@ 
     16   unsigned char test_key[30] = { 
     17@@ -1144,14 +1143,14 @@ srtp_validate() { 
    1818     0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab,  
    1919     0xab, 0xab, 0xab, 0xab 
  • packages/libs/libsrtp/patches/1007_update_Doxyfile.patch

    r29807 r29808  
    44--- a/doc/Makefile.in 
    55+++ b/doc/Makefile.in 
    6 @@ -25,6 +25,7 @@ 
     6@@ -25,6 +25,7 @@ libsrtpdoc:  
    77                echo "*** Sorry, can't build doc outside source dir"; exit 1; \ 
    88        fi 
     
    1212        sed 's/\subsection/\section/' latex/index.tex > latex/index.tmp 
    1313        mv latex/index.tmp latex/index.tex 
    14 @@ -38,7 +39,7 @@ 
     14@@ -38,7 +39,7 @@ cryptodoc: clean 
    1515        cp latex/refman.pdf crypto.pdf 
    1616  
     
    8282 \vspace*{4cm} 
    8383 %\begin{center} 
    84 @@ -107,9 +121,6 @@ 
     84@@ -107,9 +121,6 @@ This reference material in this documena 
    8585 \clearemptydoublepage 
    8686 \pagenumbering{roman} 
  • packages/libs/libsrtp/patches/1008_shared-lib.patch

    r29807 r29808  
    1414 runtest: build_table_apps test 
    1515        @echo "running libsrtp test applications..." 
    16 @@ -67,7 +67,7 @@ 
     16@@ -67,7 +67,7 @@ libdir = @libdir@ 
    1717 # implicit rules for object files and test apps 
    1818  
     
    2323 %$(EXE): %.c 
    2424        $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS) 
    25 @@ -105,6 +105,9 @@ 
     25@@ -105,6 +105,9 @@ libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi 
    2626        ar cr libsrtp.a $^ 
    2727        $(RANLIB) libsrtp.a 
     
    3333 # generate tables and verify cryptoalgorithm implementations - this 
    3434 # library is not meant to be included in production code 
    35 @@ -198,6 +201,11 @@ 
    36         cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp 
    37         if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi 
     35@@ -197,6 +200,11 @@ install: 
     36        cp include/*.h $(DESTDIR)$(includedir)/srtp   
     37        cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp 
    3838        if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi 
    3939+       if [ -f libsrtp.so.0.0 ]; then \ 
     
    4444  
    4545 uninstall: 
    46         rm -f $(DESTDIR)$(includedir)/srtp/*.h 
    47 @@ -206,7 +214,7 @@ 
     46        rm -rf $(DESTDIR)$(includedir)/srtp 
     47@@ -204,7 +212,7 @@ uninstall: 
    4848  
    4949 clean: 
Note: See TracChangeset for help on using the changeset viewer.