Bug 108428 - [maintainer update] comms/obexapp: fix conflict with mpeg4ip
Summary: [maintainer update] comms/obexapp: fix conflict with mpeg4ip
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Rong-En Fan
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2007-01-27 14:00 UTC by Guido Falsi
Modified: 2007-02-11 11:10 UTC (History)
1 user (show)

See Also:

Attachments
file.diff (1.89 KB, patch)
2007-01-27 14:00 UTC, Guido Falsi 		no flags Details | Diff
obexapp.diff (1.11 KB, patch)
2007-02-11 09:54 UTC, Guido Falsi 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Bruce M Simpson 2007-01-27 13:06:29 UTC 
Hi,

I'm concerned that this may not be the correct fix.

Thinking ahead... it certainly breaks cross-compilation and it might not 
even work on pointyhat.

For now it may be easier simply to mark obexapp as CONFLICTS with 
mpeg4ip. This forces users to resolve the conflict manually.
Alternatively, use a REINPLACE substitution after patching to make sure 
that the port references the correct header without hardcoding the base 
system path in the patch.

mpeg4ip shouldn't be installing a header whose name clashes with headers 
in the FreeBSD base include namespace; however sdp.h in both cases could 
be better named to reflect what they are.

Regards,
BMS
Comment 1 Guido Falsi freebsd_committer freebsd_triage 2007-01-27 14:00:32 UTC 
There is an include conflict between this port and mpeg4ip. A fix
was committed some time ago and remove with the last commit to this
port. Here is that fix back.

Reported by: Bruce M Simpson <bms@incunabulum.net>

Added files:

files/patch-main.c
files/patch-sdp.c
files/patch-server.c
files/patch-transport.c

How-To-Repeat: 
cd /usr/ports/multimedia/mpeg4ip && make install
cd /usr/ports/comms/obexapp && make install
Comment 2 Pav Lucistnik freebsd_committer freebsd_triage 2007-01-30 20:35:01 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->rafan

Since you took the other obexapp PR, ...
Comment 3 Rong-En Fan freebsd_committer freebsd_triage 2007-01-30 20:39:01 UTC 
State Changed
From-To: open->feedback

Wait maintainer's opinion.
Comment 4 Guido Falsi freebsd_committer freebsd_triage 2007-01-30 23:50:21 UTC 
Bruce's suggestion is quite good. I'll take a few days to make a better
patch and experiment with it.

I'll post a followup as soon as I have something usable.

-- 
Guido Falsi <mad@madpilot.net>
Comment 5 Guido Falsi freebsd_committer freebsd_triage 2007-02-11 09:54:04 UTC 
Here is an updated patch using reinplace. This patch also
incorporates(and closes) PR ports/108572 "[maintainer-update]
comms/obexapp: update to 1.4.5".

Sorry for the dalay.

-- 
Guido Falsi <mad@madpilot.net>
Comment 6 dfilter service freebsd_committer freebsd_triage 2007-02-11 11:06:43 UTC 
rafan       2007-02-11 11:06:38 UTC

  FreeBSD ports repository

  Modified files:
    comms/obexapp        Makefile distinfo 
  Log:
  - Update to 1.4.5
  - Fix conflicts with multimedia/mpeg4ip (sdp.h)
  
  PR:             ports/108428, ports/108572
  Submitted by:   Guido Falsi <mad at madpilot.net> (maintainer)
  
  Revision  Changes    Path
  1.13      +5 -2      ports/comms/obexapp/Makefile
  1.8       +3 -3      ports/comms/obexapp/distinfo
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 7 Rong-En Fan freebsd_committer freebsd_triage 2007-02-11 11:06:49 UTC 
State Changed
From-To: feedback->closed

Committed. Thanks!