https://bugzilla.redhat.com/show_bug.cgi?id=728302 Karel Volný <kvolny@xxxxxxxxxx> changed: What |Removed |Added ---------------------------------------------------------------------------- Flags| |needinfo?(lemenkov@xxxxxxxx | |m) --- Comment #57 from Karel Volný <kvolny@xxxxxxxxxx> --- (In reply to Mario Santagiuliana from comment #55) > I update the package: > Spec URL: http://marionline.fedorapeople.org/packages/SPECS/pjproject.spec > SRPM URL: > http://marionline.fedorapeople.org/packages/SRPMS/pjproject-2.0.1-1.fc18.src. > rpm > > We should resolve: > - compile using libresample already included in Fedora repo (I don't > understand if new version check if it is already installed); I got some inspiration here: http://svn.pjsip.org/repos/pjproject/trunk/third_party/build/samplerate/README.txt and I'm able to build the package with the following changes in the specfile: --- pjproject.spec~ 2013-02-16 15:16:03.000000000 +0100 +++ pjproject.spec 2013-07-31 15:22:29.408377163 +0200 @@ -17,6 +17,7 @@ BuildRequires: gsm-devel BuildRequires: portaudio-devel BuildRequires: libsrtp-devel +BuildRequires: libsamplerate-devel %description This package provides the Open Source, comprehensive, high @@ -48,11 +49,24 @@ %setup -q %patch0 -p1 %patch1 -p1 - +# make sure we don't bundle this code +rm -rf third_party/resample +# remove hardcoded references in ldflags +sed -i -e "/ac_resample_dll/,+8 d" build.mak.in +# this one seems unused: sed -i -e "s/-lresample-\$(TARGET_NAME)//" build/os-linux.mak +# fix include path to use the system library +sed -i -e "s#../../third_party/libsamplerate/src/samplerate.h#samplerate.h#" pjmedia/src/pjmedia/resample_libsamplerate.c %build env CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \ -%configure --with-external-speex --with-external-gsm --with-external-pa --libdir=%{_libdir} --disable-ffmpeg +%configure --with-external-speex --with-external-gsm --with-external-pa --libdir=%{_libdir} --disable-ffmpeg --enable-libsamplerate +# don't know where this comes from so modify Makefile directly +# to prevent the attempt to build the removed code +sed -i -e "s/resample//" third_party/build/Makefile +# the default value is PJMEDIA_RESAMPLE_LIBRESAMPLE +# and it is not redefined by configure after enabling libsamplerate +# so change that to PJMEDIA_RESAMPLE_LIBSAMPLERATE manually +echo "#define PJMEDIA_RESAMPLE_IMP PJMEDIA_RESAMPLE_LIBSAMPLERATE" > pjlib/include/pj/config_site.h make dep make clean make # cannot use %{?_smp_mflags}, the package will not build if used ... of course this is just a proof of concept, sed should be replaced with proper patches and we should patch configure rather than to modify third_party/build/Makefile after it gets configured, and try to get the changes upstream, but I guess this is a good start > - use Fedora iLBC library... I don't understand how to do this. I'd call Peter for help here (NEEDINFO) > - resolve rpmlint error (but we need a fix on upstream). you mean the FSF address issue? - this is not a blocker, but ... have you contacted upstream already? -- You are receiving this mail because: You are on the CC list for the bug. Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=ENOiwWKPb7&a=cc_unsubscribe _______________________________________________ package-review mailing list package-review@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/package-review